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

2026-07-09 08:41:58 +08:00
parent 38f15a6fe1
commit 7b4f737ce5
10 changed files with 85 additions and 17 deletions
@@ -452,10 +452,12 @@ export function App() {
        initialWorktreePreRemoveScript={settings?.worktreePreRemoveScript ?? ''}
        initialImplTabPreCreateScript={settings?.implTabPreCreateScript ?? ''}
        initialImplTabPostCloseScript={settings?.implTabPostCloseScript ?? ''}
+        initialConflictResolutionProfilePath={settings?.conflictResolutionProfilePath ?? ''}
        initialYoutrackBaseUrl={settings?.youtrackBaseUrl ?? ''}
        initialYoutrackProjectShortName={settings?.youtrackProjectShortName ?? ''}
        initialYoutrackCloseCommand={settings?.youtrackCloseCommand ?? ''}
        initialYoutrackTokenSaved={settings?.youtrackTokenSaved ?? false}
+        profiles={profiles}
        youtrackProjects={youtrackProjects}
        onListYouTrackProjects={listYouTrackProjects}
        onSubmit={saveSettings}