neu

2026-06-27 17:42:58 +02:00
parent ef1974f31f
commit 25700821d1
6 changed files with 976 additions and 143 deletions
@@ -108,3 +108,11 @@ export function resolveConflict(
 ): Promise<GitStatus> {
  return invoke<GitStatus>("resolve_conflict", { path, file, content });
 }
+
+export function resolveConflictSide(
+  path: string,
+  file: string,
+  side: "ours" | "theirs",
+): Promise<GitStatus> {
+  return invoke<GitStatus>("resolve_conflict_side", { path, file, side });
+}