checkout --carry: carried work identical to the new base is not a conflict issue #100 closed: completed andymccall opened this · 0 comments
issue #100 closed ← closed by proposal #104 carry: work the target already has is no conflict (#100) landed
andymccall set labels bug, gap ·
andymccall referenced by change 5d79b5c2de88 on carry-identical ·
closed by change fe9586d93fb1 ·
From oxygen_feedback.md (2026-10-10): uncommitted files byte-identical to what main now holds (their proposal had landed) were refused by checkout --carry, leaving only --discard, which agents rightly treat as destructive. Ask: a path whose carried content equals the new base's is already applied; more generally carry by three-way merge and refuse only on a real conflict.