优化代码冲突解决

2026-03-14 21:17:26 +08:00
parent 4129f02985
commit 2b679b5ba8
19 changed files with 165 additions and 15 deletions
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -670,6 +670,7 @@ export interface GitConflictInfo {
  has_conflicts: boolean
  conflicted_files: string[]
  operation: string
+  upstream_commit?: string | null
 }

 export interface GitPullResult {