Lutra/ui/src/components
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
..
editor M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
find M2.4: Find tool window in a new bottom panel 2026-10-17 12:42:53 +02:00
goto M2.6: go-to popup for files, classes and symbols 2026-10-17 17:35:50 +02:00
layout M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
menu M3.3: engine wiring for Phpactor and diagnostics 2026-10-21 18:58:32 +02:00
notifications M1.12: notifications as toasts 2026-10-16 16:20:45 +02:00
palette M1.15: one modal at a time, restore dialog follows outside restores 2026-10-16 21:49:38 +02:00
problems H3: Phpactor UX: fast tick while indexing, progress, messages, php -l 2026-10-25 17:36:10 +01:00
project M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
recovery M1.15: one modal at a time, restore dialog follows outside restores 2026-10-16 21:49:38 +02:00
settings H4: string and path settings controls, live completion and tooltip settings 2026-10-25 13:10:39 +01:00
structure M2.7: Structure tool window and syntax.outline 2026-10-17 17:04:12 +02:00
terminal M3.6: integrated terminal with PTY sessions and xterm.js sub-tabs 2026-10-20 21:10:37 +02:00
vcs M4.8: merge conflicts with a three-pane resolve view 2026-10-29 18:51:04 +01:00
StatusBar.vue M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00