Lutra/crates
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
..
control M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00
engine M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
index M2.5: symbol index and go-to commands 2026-10-17 12:53:33 +02:00
lsp F3: suspended Phpactor start, ConPTY shell in a job, cancel superseded completions, syntax proptest 2026-10-27 17:28:54 +01:00
mcp M3.8: MCP server lutra mcp 2026-10-20 20:43:12 +02:00
proc F3: suspended Phpactor start, ConPTY shell in a job, cancel superseded completions, syntax proptest 2026-10-27 17:28:54 +01:00
search M2.3: find in files backend 2026-10-16 22:04:28 +02:00
syntax F3: suspended Phpactor start, ConPTY shell in a job, cancel superseded completions, syntax proptest 2026-10-27 17:28:54 +01:00
terminal F3: suspended Phpactor start, ConPTY shell in a job, cancel superseded completions, syntax proptest 2026-10-27 17:28:54 +01:00
testkit M3.5: pending outcomes for commands that wait for the language server 2026-10-22 06:36:20 +02:00
text M1.1: text buffer with UTF-16 positions, edit batches and line endings 2026-10-14 19:20:18 +02:00
vcs M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
vfs M1.2: native file watching via notify 2026-10-14 19:43:15 +02:00