Lutra/crates/engine/tests
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
..
git.rs F1: remote checkout without a remote, git.lastMessage, shared git status store 2026-10-27 17:16:53 +01:00
git_lines.rs M4.4: Git gutter change markers and status colours in tree and tabs 2026-10-25 17:40:30 +01:00
git_log.rs M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
git_merge.rs M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
git_remote.rs M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00
goto.rs M2.6: go-to popup for files, classes and symbols 2026-10-17 17:35:50 +02:00
lsp.proptest-regressions M4.1: Git backend through the installed git 2026-10-25 16:52:29 +01:00
lsp.rs H3: Phpactor UX: fast tick while indexing, progress, messages, php -l 2026-10-25 17:36:10 +01:00
lsp_assist.rs F3: suspended Phpactor start, ConPTY shell in a job, cancel superseded completions, syntax proptest 2026-10-27 17:28:54 +01:00
lsp_nav.rs M3.5: go to definition, find references and rename through Phpactor 2026-10-22 18:50:15 +02:00
lsp_ux.rs H3: Phpactor UX: fast tick while indexing, progress, messages, php -l 2026-10-25 17:36:10 +01:00
pending.rs M3.5: pending outcomes for commands that wait for the language server 2026-10-22 06:36:20 +02:00
recovery.rs M1.15: one modal at a time, restore dialog follows outside restores 2026-10-16 21:49:38 +02:00
search.rs M2.3: find in files backend 2026-10-16 22:04:28 +02:00
settings.rs M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00
syntax.proptest-regressions M2.7: Structure tool window and syntax.outline 2026-10-17 17:04:12 +02:00
syntax.rs M2.7: Structure tool window and syntax.outline 2026-10-17 17:04:12 +02:00
terminal.rs M3.6: integrated terminal with PTY sessions and xterm.js sub-tabs 2026-10-20 21:10:37 +02:00
theme.rs H5: banner-aligned themes, diagnostic and VCS tokens 2026-10-25 13:58:38 +01:00
ui_commands.rs M1.8: command palette, global keymap, UI commands 2026-10-16 16:59:43 +02:00
workspace.rs M3.10: autosave and flushDirty 2026-10-20 21:01:12 +02:00