almost

2026-06-27 14:11:51 +02:00
parent 6a78e768bc
commit ef1974f31f
7 changed files with 849 additions and 6 deletions
@@ -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;
+}