Identical conflict resolutions on two bookmarks conflict with each other issue #146 closed: completed andymccall opened this · 0 comments
issue #146 closed ← closed by proposal #151 Identical conflict sides settle by themselves (#146) landed
andymccall set labels bug ·
closed by change c0d4075cadc0 ·
From ~/oxygen_feedback.md (supermarioland, 2026-10-26): two bookmarks each merged the same develop change, got the same one-hunk conflict and resolved it to byte-identical text; after one landed, merging develop into the other conflicted in that hunk, both sides the identical text (changes 3e2029b6 and 7acf5c76). Expected: two resolutions with the same result are no conflict. Repro in the entry. Needs a design (two resolution changes each insert the same lines: an adjacent insertion whose sides are equal), likely: sides with identical text render once and need no resolution.