neu

src/lib/git.ts

@@ -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 });
+}

src/lib/types.ts

@@ -38,6 +38,7 @@ export interface GitCommit {
   author_email: string;
   date: string;
   refs: string[];
+  parents: string[];
   files: GitCommitFile[];
 }
 
@@ -76,4 +77,7 @@ export interface ConflictFile {
   ours: string | null;
   theirs: string | null;
   base: string | null;
+  binary: boolean;
+  ours_size: number | null;
+  theirs_size: number | null;
 }