edit

src/lib/types.ts

@@ -71,6 +71,28 @@ export interface GitCommitComparison {
   patch: string;
 }
 
+export type ExplorerNodeKind = "folder" | "file";
+
+export interface ExplorerNode {
+  name: string;
+  path: string;
+  kind: ExplorerNodeKind;
+  status: FileStatusKind | null;
+  tracked: boolean;
+  depth: number;
+  children: ExplorerNode[];
+}
+
+export type ConflictChoice = "ours" | "theirs" | "both-ot" | "both-to";
+
+export type ConflictPart =
+  | { kind: "text"; lines: string[] }
+  | { kind: "conflict"; index: number; oursLines: string[]; theirsLines: string[] };
+
+export type PreparedResolution =
+  | { kind: "content"; content: string }
+  | { kind: "side"; side: "ours" | "theirs" };
+
 export interface ConflictFile {
   path: string;
   content: string;