OXYGENHUB

Commit a resolution by paths, and amend only some paths (#118) proposal #125 landed andymccall wants paths-for-resolutions-and-amend into main · 2 changes · opened

issue #118 Commit only some paths when committing a conflict resolution or amending closed → proposal #125 landed → main landed

conversation (0) changes (2) files (0) projected state ef21e8915348 · 68 heads · browse · json
andymccall opened this proposal
···

Closes issue #118 (Metal Gear's feedback, 2026-10-18).

  • oxy commit PATH.. now works for a conflict resolution: the paths must include every file it resolves (whole), else it is refused naming them; the rest stays uncommitted on the resolved state. Before, any partial resolution was refused ('must be committed whole').
  • oxy amend PATH.. folds only those paths into the head: they are committed as a change on the head and squashed into it (§8.5), so the head keeps its ChangeId; -m replaces its message. --into and paths don't combine.
  • Test resolutions_and_amends_take_paths; spec §12.3 and the synopsis. Gate green.

andymccall opened

andymccall set labels: gap

andymccall referenced by change 3652104ae7d3 on main

andymccall referenced by change 87322662f607 on paths-for-resolutions-and-amend

andymccall referenced by change 87322662f607 on main

andymccall referenced by change 3652104ae7d3 on doctor-trust

andymccall referenced by change 87322662f607 on doctor-trust

andymccall referenced by change 3652104ae7d3 on keyless-tags

andymccall referenced by change 87322662f607 on keyless-tags

Proposal landed

Landed 2 changes into main .