A proposal's conflicts can only be resolved from the command line issue #337 closed: completed andymccall opened this 9 days ago · 0 comments

Andy (2026-10-26), on proposal proposal #333 (one CHANGELOG.md conflict with main): the page says 'Landing would carry 1 conflict … See them' and shows the regions read-only; the resolver (region by region, keep a side, keep every side) only works on a bookmark that already carries a conflict, and the source bookmark does not: the conflict exists only in the projection onto the target. So the only way is oxy merge on the source bookmark, editing markers, commit, push. Wanted: a Resolve button on a conflicted proposal (for those who may push to its source) that merges the target into the source bookmark as a hosted change and opens the resolver on it, so the proposal follows the resolution, all on the web. Related: merge=union (oxygen#145) makes changelog clashes like this one resolve themselves once a repository marks CHANGELOG.md.