Briefs: a merge pass never rebases on a rejected push

eureka commented

2026-10-13 02:18:26 +00:00

Owner

Rebase on a rejected push flattened the reveals-replace-tiers merge to Aetheria master and dropped its merge-time test fixes (master 07854ed5 did not compile; repaired forward in 20cd1d7c). Cut branches keep pull --rebase; merge passes fetch and merge origin/master into their verified merge, re-verify, and push. Changelog entry 2026-10-13.

?? Generated with Claude Code

Rebase on a rejected push flattened the reveals-replace-tiers merge to Aetheria master and dropped its merge-time test fixes (master 07854ed5 did not compile; repaired forward in 20cd1d7c). Cut branches keep pull --rebase; merge passes fetch and merge origin/master into their verified merge, re-verify, and push. Changelog entry 2026-10-13. ?? Generated with [Claude Code](https://claude.com/claude-code)

eureka added 1 commit

2026-10-13 02:18:27 +00:00

Briefs: a merge pass never rebases on a rejected push 5a84f85746

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>

eureka added 1 commit

2026-10-13 02:52:31 +00:00

Briefs and campaign-state: map edits in a named worktree; re-mapping a withdrawn cut is two batches c9cf8e274e

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>

eureka added 1 commit

2026-11-05 10:55:31 +00:00

Merge main into merge-never-rebases 7722f1a088

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

eureka merged commit 4175d483bb into main

2026-11-05 10:57:34 +00:00

eureka referenced this pull request from a commit

2026-11-05 10:57:35 +00:00

Merge pull request 'Briefs: a merge pass never rebases on a rejected push' (#20) from self/merge-never-rebases into main

Rows
Columns

Briefs: a merge pass never rebases on a rejected push #20