Preserve merge conflict contents in imported worktrees - #77

Merged

wesm merged 14 commits into

mainfrom

fix/merge-driver-conflict-markers

Sep 1, 2026

Commits on Aug 29, 2026

Design safe merge-driver fallback

wesm
and
codex
committed
d65c8b7
Correct safe merge-driver design

wesm
and
codex
committed
c5c5cc6
Narrow merge-driver status handling

wesm
and
codex
committed
20e7fc0
Plan safe merge-driver implementation

wesm
and
codex
committed
5e345b3
refactor(git): share shell quoting helper

wesm
and
codex
committed
8fc6395
fix(git): preserve merge conflict contents

wesm
and
codex
committed
7d1f988
test(git): prove safe merge driver paths

wesm
and
codex
committed
2914858
docs(git): define safe merge driver behavior

wesm
and
codex
committed
7840228
fix(git): escape merge driver template paths

wesm
and
codex
committed
5a7d905
fix(git): distinguish merge driver failures

wesm
and
codex
committed
0eb84a5
fix(git): isolate merge input classification

wesm
and
codex
committed
3cbbc44

Commits on Aug 30, 2026

test(git): pin merge classifier text limit

wesm
and
codex
committed
ae50c28
test(git): cover merge process crashes

wesm
and
claude
committed
449196e

Commits on Aug 31, 2026

docs(git): drop merge-driver design working notes

wesm
and
claude
committed
baf6992