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

2026-07-09 08:41:58 +08:00
parent 38f15a6fe1
commit 7b4f737ce5
10 changed files with 85 additions and 17 deletions
@@ -40,6 +40,7 @@ export interface SettingsValues {
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
  implTabPostCloseScript: string
+  conflictResolutionProfilePath: string
  youtrackBaseUrl: string
  youtrackProjectShortName: string
  youtrackCloseCommand: string
@@ -65,6 +66,7 @@ export interface SettingsOverlayState {
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
  implTabPostCloseScript: string
+  conflictResolutionProfilePath: string
  youtrackBaseUrl: string
  youtrackProjectShortName: string
  youtrackCloseCommand: string
@@ -278,6 +280,7 @@ export function useIssues(): UseIssuesResult {
      worktreePreRemoveScript: values.worktreePreRemoveScript,
      implTabPreCreateScript: values.implTabPreCreateScript,
      implTabPostCloseScript: values.implTabPostCloseScript,
+      conflictResolutionProfilePath: values.conflictResolutionProfilePath,
      youtrackBaseUrl: values.youtrackBaseUrl,
      youtrackProjectShortName: values.youtrackProjectShortName,
      youtrackCloseCommand: values.youtrackCloseCommand,
@@ -606,6 +609,7 @@ export function useIssues(): UseIssuesResult {
            worktreePreRemoveScript: msg.worktreePreRemoveScript,
            implTabPreCreateScript: msg.implTabPreCreateScript,
            implTabPostCloseScript: msg.implTabPostCloseScript,
+            conflictResolutionProfilePath: msg.conflictResolutionProfilePath,
            youtrackBaseUrl: msg.youtrackBaseUrl ?? '',
            youtrackProjectShortName: msg.youtrackProjectShortName ?? '',
            youtrackCloseCommand: msg.youtrackCloseCommand ?? '',