Lutra/ui/tests/vcs
danny d82e57b3ac 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>
2026-10-29 18:51:04 +01:00
..
Branches.test.ts M4.5: branch status-bar item and branches popup 2026-10-26 17:56:24 +01:00
ChangesToolWindow.test.ts F1: remote checkout without a remote, git.lastMessage, shared git status store 2026-10-27 17:16:53 +01:00
DiffView.test.ts M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
Log.test.ts M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
Merge.test.ts M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
Remote.test.ts M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00
vcsStatus.test.ts M4.4: Git gutter change markers and status colours in tree and tabs 2026-10-25 17:40:30 +01:00