Committing a conflict resolution requires the whole working copy, even unrelated untracked files issue #130 closed: completed andymccall opened this · 1 comment
andymccall set labels gap ·
andymccall
Checked 2026-10-21 with oxy 0.5.1: a merge with a CHANGELOG.md conflict, resolved, plus two untracked files (scaling.md, assets/icon.png); oxy commit -m resolve CHANGELOG.md records the resolution and says "2 paths left uncommitted". The error quoted here ("must be committed whole") is from before oxygen#118 (released in 0.5.0), which lets a resolution be committed by paths as long as they hold every file it resolves; that commit ran with an older oxy. Closing as fixed by issue #118.
andymccall closed ·
Found 2026-10-20: after a merge with a CHANGELOG.md conflict in the oxygenhub checkout (which holds two untracked files that must never be committed: docs/scaling.md, assets/icons/oxygenhub.png),
oxy commit CHANGELOG.md deps/oxygenflowandoxy commit CHANGELOG.mdboth failed with "a conflict resolution must be committed whole". The only way through was to move the untracked files out of the checkout, commit everything, and move them back. Proposed: a resolution commit must include every conflicted path and every change the merge brought, but may leave out paths that are untracked/added and unrelated to the merge (or allow--exclude PATH); the error should list which paths it insists on and why.