docs: Add collection branch safety warnings to PR workflow#5176
Merged
docs: Add collection branch safety warnings to PR workflow#5176
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>
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
|
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
Adds explicit warnings to
pr.mdcandcreate-java-prskill that the collection branch in a stacked PR workflow must never be manually merged, fast-forwarded, or pushed to.Changes:
.cursor/rules/pr.mdc: Added CRITICAL warning in "Creating the Collection Branch" section; added "Never merge into the collection branch" note in "Syncing the Stack" section; fixed example branch name to usefeat/scope-attributes-apiinstead offeat/scope-attributes(which is the collection branch).claude/skills/create-java-pr/SKILL.md: Added CRITICAL warning in Step 1's stacked PR guidance💡 Motivation and Context
During cache tracing PR stack work, the collection branch was accidentally fast-forwarded to include all stack commits. GitHub interpreted this as all stack PRs being merged, auto-closed them, and deleted their head branches. The entire stack had to be recreated with new PR numbers.
This adds guardrails to prevent the same mistake in future sessions.
💚 How did you test it?
Documentation-only change. Reviewed the wording for clarity and completeness.
📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps
None.
#skip-changelog