✨ feat(vscode): 冲突解决会话 profile 可在设置面板配置

2026-07-09 08:41:58 +08:00
parent 38f15a6fe1
commit 7b4f737ce5
10 changed files with 85 additions and 17 deletions
@@ -81,6 +81,7 @@ export type ExtensionToWebview
      worktreePreRemoveScript: string
      implTabPreCreateScript: string
      implTabPostCloseScript: string
+      conflictResolutionProfilePath: string
      youtrackBaseUrl?: string
      youtrackProjectShortName?: string
      youtrackCloseCommand?: string
@@ -142,6 +143,7 @@ export type WebviewToExtension
      worktreePreRemoveScript: string
      implTabPreCreateScript: string
      implTabPostCloseScript: string
+      conflictResolutionProfilePath: string
      youtrackBaseUrl: string
      youtrackProjectShortName: string
      youtrackCloseCommand: string