A resolution can't be committed when the file has text that looks like oxy's markers (the spec's own example) issue #126 closed: completed andymccall opened this 17 days ago · 0 comments

Found 2026-10-18 resolving proposal proposal #125 after proposal #124 landed: docs/spec.md conflicted on one synopsis line; after resolving it, oxy status still says 'markers remain' and commit refuses, because §9.5 holds a fenced example of oxy's conflict markers ('<<<<<<< oxy conflict 1 of 2, side 1: change k7m2p9 …'). has_conflict_markers (crates/oxy-core/src/repo/snapshot.rs) counts any line starting '<<<<<<< oxy conflict' / '======= oxy conflict' / '>>>>>>> oxy conflict' in a file that was conflicted. Any repository documenting oxy, or a test fixture holding markers, can never resolve a conflict in that file.

Fix: a file still has conflict markers only when it holds one of the marker lines oxy wrote for this file's conflicts (they name the real changes and counts), not any marker-like text.