OXYGENHUB

carry: work the target already has is no conflict (#100) proposal #104 landed andymccall wants carry-identical into main · 0 changes · opened

issue #100 checkout --carry: carried work identical to the new base is not a conflict closed → proposal #104 landed → main landed

conversation (0) changes (0) files (0) projected state ef21e8915348 · 68 heads · browse · json
andymccall opened this proposal

Closes issue #100 (from oxygen_feedback.md; and it bit tonight's work too).

checkout --carry / bookmark switch --carry refused when uncommitted files were byte-for-byte what the target state holds, as after the proposal of that work landed, so the only way on was --discard, which agents rightly treat as destructive. A changed path whose file on disk is exactly the target's version (same bytes and exec bit), or a removed path the target lacks too, is now already applied: no conflict, nothing to carry; the other work still comes along, and a real difference is still refused.

Tests: carrying_work_the_target_already_has_is_no_conflict (new); merges_move_clean_working_copies_and_checkouts_say_what_blocks_them updated (its removed b.txt case is now this). Gate green (332 tests, clippy, fmt). Bookmark is main's heads plus this change.

andymccall opened

andymccall set labels: bug, gap

Proposal landed

Landed into main .