feat: support for conflict resolution / merging#2

Merged

Michael Thomas (michaelhthomas) merged 21 commits into

mainfrom

merge

May 12, 2026

Commits on May 12, 2026

feat: add opener plugin + reveal/VS Code escape hatches on conflict panels

authored and
Michael Thomas
committed
feat: expose conflict info + plain-language ConflictPanel

authored and
Michael Thomas
committed
feat: one-click conflict resolution (keep mine / accept remote / discard)

authored and
Michael Thomas
committed
feat: add 3-way conflict content extraction and complete-merge backend

authored and
Michael Thomas
committed
feat: add mismerge 3-way conflict editor modal

authored and
Michael Thomas
committed
test: add integration tests for conflict resolution paths

authored and
Michael Thomas
committed
chore: format

Michael Thomas (michaelhthomas)
authored and
Michael Thomas
committed
fix: address PR review feedback on conflict resolution

authored and
Michael Thomas
committed
chore: format

Michael Thomas (michaelhthomas)
authored and
Michael Thomas
committed
feat: support file-level merge conflicts (renames, deletes)

Michael Thomas (michaelhthomas)
authored and
Michael Thomas
committed
fix: use onConflictsResolvedChange for merge gating; remove ResolvedFileEntry

authored and
Michael Thomas
committed
fix: address remaining PR review comments

authored and
Michael Thomas
committed
fix: address remaining unresolved PR review comments

authored and
Michael Thomas
committed
fix: correct error state labels and platform-specific reveal label

authored and
Michael Thomas
committed
refactor(sync): reduce duplication and clarify APIs

authored and
Michael Thomas
committed
feat: surface renamed-file paths in conflict merge editor

authored and
Michael Thomas
committed
refactor: move tree-view to src/components/ui/

authored and
Michael Thomas
committed
refactor(ConflictPanel): unify JSX and use shadcn Button

authored and
Michael Thomas
committed
refactor(MergeEditorModal): use shadcn Resizable and extract sub-components

authored and
Michael Thomas
committed
refactor(merge): split into several components more intentionally
Michael Thomas
committed
refactor: represent conflicts using discriminated union, support for
Michael Thomas
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support for conflict resolution / merging#2

feat: support for conflict resolution / merging#2
Michael Thomas (michaelhthomas) merged 21 commits into
mainfrom
merge

Commits on May 12, 2026

feat: add opener plugin + reveal/VS Code escape hatches on conflict panels

feat: expose conflict info + plain-language ConflictPanel

feat: one-click conflict resolution (keep mine / accept remote / discard)

feat: add 3-way conflict content extraction and complete-merge backend

feat: add mismerge 3-way conflict editor modal

test: add integration tests for conflict resolution paths

chore: format

fix: address PR review feedback on conflict resolution

chore: format

feat: support file-level merge conflicts (renames, deletes)

fix: use onConflictsResolvedChange for merge gating; remove ResolvedFileEntry

fix: address remaining PR review comments

fix: address remaining unresolved PR review comments

fix: correct error state labels and platform-specific reveal label

refactor(sync): reduce duplication and clarify APIs

feat: surface renamed-file paths in conflict merge editor

refactor: move tree-view to src/components/ui/

refactor(ConflictPanel): unify JSX and use shadcn Button

refactor(MergeEditorModal): use shadcn Resizable and extract sub-components

refactor(merge): split into several components more intentionally

refactor: represent conflicts using discriminated union, support for