Repository navigation
feat(stacked-prs): Add skill for safely updating stacked PRs - #179
Open
sentry-junior[bot] wants to merge 1 commit into
Open
sentry-junior[bot] wants to merge 1 commit into
sentry-junior[bot] wants to merge 1 commit into
Conversation
Moves guidance that otherwise lives in always-on CLAUDE.md context into an on-demand skill: check the PR base before merging, update stacks bottom-up, verify the file count before pushing, and clean up stray CODEOWNERS review requests if a bad push goes out. Co-Authored-By: Josh Goldberg <joshua.goldberg@sentry.io>
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
stacked-prsskill so agents stop merging the default branch into a PR whose base is another feature branch. When that happens, every default-branch commit the base doesn't have lands in the PR diff, and CODEOWNERS requests review from dozens of teams on push. Those notifications can't be unsent.The guidance started as a
CLAUDE.mdrule. It's moving into a skill so it only loads when an agent is actually updating a PR branch, and doesn't sit in always-on context.The skill tells the agent to:
baseRefNamebefore any merge, rebase, or pushbase...HEADfile count to the PR'schangedFilesbefore pushing, and stop to ask if it jumpsreview_requestedevents to remove only the review requests that push addedThe skill is registered in the README,
.claude/settings.json, and theclaude-settings-auditallowlist.via Josh Goldberg.
--
View Junior Session [Sentry]