M4.8: merge conflicts with a three-pane resolve view

Backend (crates/vcs/src/merge.rs, cmd/git_merge.rs via start_with):
git.merge {branch} -> {result: merged|upToDate|conflicts, conflicts},
git.mergeAbort, git.conflictVersions {path} -> {base?, ours, theirs,
binary, tooLarge} from the index stages :1:/:2:/:3:, git.markResolved
{paths}. Repo::lock becomes pub(crate) so merge and abort hold the
mutation lock.

UI (ui/src/components/vcs/merge/): merge dialog with branch picker,
conflicts list from the shared status store, a three-pane resolve view
(ours / editable result / theirs) with accept left/right per chunk,
accept all, previous/next conflict, Apply through the file's buffer then
mark resolved, keep-a-side for modify/delete, abort after confirmation.
Own three-way line merge on @codemirror/merge's diff. UI commands
vcs.merge, vcs.resolveConflicts, vcs.abortMerge (no default shortcuts);
the Changes window opens conflicted rows in the resolve view.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
danny 2026-10-29 17:48:24 +01:00
parent 74c674ed12
commit d82e57b3ac
26 changed files with 3872 additions and 16 deletions

View file

@ -42,6 +42,9 @@ export const UI_COMMANDS: readonly UiCommandSpec[] = [
{ id: "vcs.fetch", labelKey: "command.vcs.fetch", menuPath: "Git/Fetch" },
{ id: "vcs.manageRemotes", labelKey: "command.vcs.manageRemotes", menuPath: "Git/Manage Remotes…" },
{ id: "vcs.newBranch", labelKey: "command.vcs.newBranch", menuPath: "Git/New Branch…" },
{ id: "vcs.merge", labelKey: "command.vcs.merge", menuPath: "Git/Merge…" },
{ id: "vcs.resolveConflicts", labelKey: "command.vcs.resolveConflicts", menuPath: "Git/Resolve Conflicts…" },
{ id: "vcs.abortMerge", labelKey: "command.vcs.abortMerge", menuPath: "Git/Abort Merge…" },
{ id: "vcs.openChanges", labelKey: "command.vcs.openChanges", menuPath: "Git/Changes", defaultShortcut: "Mod+Alt+Shift+G" },
{ id: "vcs.pull", labelKey: "command.vcs.pull", menuPath: "Git/Pull" },
{ id: "vcs.push", labelKey: "command.vcs.push", menuPath: "Git/Push" },