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

@ -45,8 +45,8 @@ const usedKeys = sourceFiles(SRC).flatMap((file) =>
* `settings.list`, the `messageKey` of
* `notification` events (engine and desktop host), the keys the
* notifications store passes through a constant, and the Changes
* window's commit toasts (M4.2), the branch toasts (M4.5) and the remote
* toasts (M4.10), passed as
* window's commit toasts (M4.2), the branch toasts (M4.5), the merge
* toasts (M4.8) and the remote toasts (M4.10), passed as
* `messageKey`.
*/
const RUNTIME_KEYS = new Set([
@ -68,6 +68,12 @@ const RUNTIME_KEYS = new Set([
"notification.vcs.historyNoFile",
"notification.vcs.commitNotSaved",
"notification.vcs.committed",
"notification.vcs.mergeAborted",
"notification.vcs.mergeConflicts",
"notification.vcs.mergeFailed",
"notification.vcs.mergeNotSaved",
"notification.vcs.mergeUpToDate",
"notification.vcs.merged",
"notification.vcs.newBranchFailed",
"notification.vcs.cloned",
"notification.vcs.fetchFailed",
@ -79,6 +85,7 @@ const RUNTIME_KEYS = new Set([
"notification.vcs.pushed",
"notification.vcs.pushedUpstream",
"notification.vcs.remoteCancelled",
"notification.vcs.resolved",
"notification.settings.corrupt",
"notification.settings.corruptNotMoved",
"notification.settings.unavailable",