Identical conflict sides settle by themselves (#146) proposal #151 landed andymccall wants identical-sides into main · 2 changes · opened 9 days ago

Closes issue #146 (supermarioland feedback). Design as Andy chose: auto-settle, keep one, any file. New State::settle_plans(node, union): per conflict, identical sides keep one; adjacent insertions in merge=union files keep both (issue #145). settle_text generalises the marker rewrite (keep_both_text wraps it). Checkout's settle_conflicts (was settle_unions) applies it to every conflicted text file, and Repo::union_resolution, which the hub lands with, settles identical sides too, so the hub needs only the pin bump. KeptBoth.identical lets the CLI say 'kept one of its identical sides'. Spec §9.5 and changelog updated. Test identical_resolutions_on_two_bookmarks_settle_by_themselves reproduces the report (two resolutions to the same text, merged). Gate passes.