Skip to content

docs(rules): merge a stack in one step with gh stack merge #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zolotokrylin merged 1 commit into from
Oct 9, 2026
Merged

docs(rules): merge a stack in one step with gh stack merge #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions docs/rules/DEV-325.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ one it depends on, and GitHub shows them as one stack.
`sync`), not by retargeting branches by hand.
1. In each PR description, say what it is stacked on and what it adds, so a
reader follows the stack bottom to top. A PR that nothing calls yet says so.
1. Merge the stack in order, bottom first.
1. Merge with `gh stack merge`, which merges every PR up to the one you choose
in a single step, bottom first. Merging one PR at a time from the GitHub page
forces a rebase of every PR above it: the squash merge writes a new commit,
and the branches above still carry the original ones.

Good: "Stacked on the calculation PR. Turns logged hours into the markdown the
command will post; nothing calls it yet." Bad: five PRs opened against the
Expand All @@ -38,4 +41,4 @@ other four.
the default branch
- [ ] The Spec PR, when there is one, sits at the bottom of the stack
- [ ] Each PR description says what it is stacked on and what it adds
- [ ] The stack merges bottom first
- [ ] The stack merges bottom first, with `gh stack merge`
Loading