Repository navigation
Write down the stacked-PR rule that has stranded work twice - #30
Merged
Merged
Conversation
Merging a PR into a base branch that has already merged puts the work in a branch nobody will merge from again, and GitHub still shows every PR in the stack as merged. It cost the Time chapter rewrite once and the #17/#18 pair before that. Records the rule (retarget onto main before merging the child), the one-line check that proves a branch actually landed, and the verify commands this repository expects before a push. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ABFpszmPxRorwWtWGR2jXj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a
CLAUDE.md. Flat offmain, independent of #29.Stacked PRs have stranded work in this repository twice — the #17/#18 pair, and now the Time chapter rewrite in #22/#26. The failure is silent: merging a child into a base branch that has already merged puts the work somewhere nobody will merge from again, while GitHub reports every PR in the stack as merged.
The file records:
mainas soon as the parent merges, and before merging the child. Never merge a PR whose base branch has already merged. Prefer flat PRs offmainwhen the work is separable.npm run lint,check-figure-geometry.mjs,npm run build-pdf), plus the faster single-chapter preview.Generated by Claude Code