Lutra/docs
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
..
images M1.14: app icon and README banner 2026-10-16 17:00:48 +02:00
architecture.md M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
development.md PM: merge F3 hardening: suspended Phpactor start, ConPTY in a job, completion cancel, syntax proptest 2026-10-27 17:30:10 +01:00
framework-parity.md M0: import starter package (rules, roadmap, progress docs) 2026-10-13 20:22:22 +02:00
gaps.md M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
language-parity.md M3.5: go to definition, find references and rename through Phpactor 2026-10-22 18:50:15 +02:00
localization-parity.md M1.9b: settings dialog with search 2026-10-16 21:13:04 +02:00
roadmap.md M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
target-app-parity.md M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
tooling-parity.md M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
ui-parity.md M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00