almost

src/lib/git.ts

@@ -1,6 +1,7 @@
 import { invoke } from "@tauri-apps/api/core";
 
 import type {
+  ConflictFile,
   GitBranch,
   GitCommit,
   GitCommitComparison,
@@ -95,3 +96,15 @@ export function diffFileAgainstWorkingTree(
 ): Promise<GitCommitComparison> {
   return invoke<GitCommitComparison>("diff_file_against_working_tree", { path, commit, file });
 }
+
+export function readConflict(path: string, file: string): Promise<ConflictFile> {
+  return invoke<ConflictFile>("read_conflict", { path, file });
+}
+
+export function resolveConflict(
+  path: string,
+  file: string,
+  content: string,
+): Promise<GitStatus> {
+  return invoke<GitStatus>("resolve_conflict", { path, file, content });
+}

src/lib/types.ts

@@ -69,3 +69,11 @@ export interface GitCommitComparison {
   files: GitDiffFile[];
   patch: string;
 }
+
+export interface ConflictFile {
+  path: string;
+  content: string;
+  ours: string | null;
+  theirs: string | null;
+  base: string | null;
+}