Briefs: a merge pass never rebases on a rejected push #20
2026-10-13
Briefs and campaign-state: map edits in a named worktree; re-mapping a withdrawn cut is two batches
An Imagination pass edited the operator's checkout (stale map, beside her uncommitted work); <path> is now a worktree Self names. Withdrawing a withdrawal and admitting the next revision in one batch is refused WouldReinstateOverLater. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Briefs: a merge pass never rebases on a rejected push
Rebase flattened the reveals-replace-tiers merge and dropped its merge-time test fixes; Aetheria master 07854ed5 did not compile. Cut branches keep pull --rebase; merges to master fetch and merge origin/master instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>