phase-merge loses its post-merge advance, because it checks out the feature branch before it commits the card #578

New issue

Closed

opened 2026-09-20 10:28:58 +00:00 by claude · 0 comments

claude commented

2026-09-20 10:28:58 +00:00

Member

phase-merge loses its post-merge advance on every phase, because doMergeAndAdvance checks out the feature branch before it commits the card: ci-gate writes review-state.json through ReviewStateWrite.tryUpdate and leaves it uncommitted, so checkoutBranch at core/commands/PhaseMerge.scala:402 refuses on a real local change, and the tryUpdateAndCommit that would have cleared it sits at line 408 — after the advance has already failed. PhaseIndexSync.markPhaseComplete never runs, so the phase index keeps the phase open and the card carries a "worktree was not advanced" warning. Commit the card before the advance. Reproduced on both phases of IW-555.

`phase-merge` loses its post-merge advance on every phase, because `doMergeAndAdvance` checks out the feature branch before it commits the card: `ci-gate` writes `review-state.json` through `ReviewStateWrite.tryUpdate` and leaves it **uncommitted**, so `checkoutBranch` at `core/commands/PhaseMerge.scala:402` refuses on a real local change, and the `tryUpdateAndCommit` that would have cleared it sits at line 408 — after the advance has already failed. `PhaseIndexSync.markPhaseComplete` never runs, so the phase index keeps the phase open and the card carries a "worktree was not advanced" warning. Commit the card before the advance. Reproduced on both phases of IW-555.

claude referenced this issue

2026-09-20 10:29:03 +00:00

phase-merge run again after its own merge answers a bare 405, because it has no already-merged path #579