docs: Improve stacked PR workflow for collection branch and merge method#5178
Merged
docs: Improve stacked PR workflow for collection branch and merge method#5178
Conversation
Add explicit warnings to pr.mdc and create-java-pr skill that the collection branch must never be manually merged or fast-forwarded. Updating it causes GitHub to auto-merge all stack PRs and delete their branches, destroying the entire stack. Co-Authored-By: Claude <noreply@anthropic.com>
The stack list update instructions only mentioned "all PRs in the stack" which was ambiguous — it could be read as excluding the collection branch PR. Now both pr.mdc and the create-java-pr skill explicitly call out that the collection branch PR must also be updated with the stack list. Co-Authored-By: Claude <noreply@anthropic.com>
Stack PRs must be merged with merge commits, not squash. Add a reminder to the PR description so reviewers/mergers pick the right method. This only applies to stack PRs — not standalone PRs or the collection branch PR. Co-Authored-By: Claude <noreply@anthropic.com>
Contributor
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
Sentry Build Distribution
|
lbloder
approved these changes
Mar 9, 2026
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 0ceb700 | 305.81 ms | 355.91 ms | 50.10 ms |
| 855766f | 364.82 ms | 427.16 ms | 62.35 ms |
| eeb463c | 311.36 ms | 371.79 ms | 60.43 ms |
| b2b863f | 338.62 ms | 376.54 ms | 37.92 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 0ceb700 | 0 B | 0 B | 0 B |
| 855766f | 0 B | 0 B | 0 B |
| eeb463c | 0 B | 0 B | 0 B |
| b2b863f | 0 B | 0 B | 0 B |
Sentry Build Distribution
|
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
2 participants
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.
📜 Description
Add two improvements to the stacked PR workflow documentation:
Collection branch PR in stack list — Clarify that the collection branch PR must also be updated with the stack list when creating stacked PRs. Previously "all PRs in the stack" was ambiguous and could be read as excluding the collection branch PR.
Merge method reminder on stack PRs — Add a merge commit reminder to the bottom of stack PR descriptions, since stack PRs must use merge commits (not squash). This does not apply to standalone PRs or the collection branch PR.
💡 Motivation and Context
When using the
/create-java-prskill or followingpr.mdcfor stacked PRs, the collection branch PR was not getting updated with the stack list. Additionally, there was no reminder about using merge commits for stack PRs, which could lead to accidentally squash-merging and causing conflicts in the stack.💚 How did you test it?
Documentation-only changes — reviewed for correctness and consistency between
pr.mdcandSKILL.md.📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
None — standalone docs improvement.
#skip-changelog