fix: update backport skill for ClaudeBox environment#21855
Merged
Conversation
AztecBot
added
ci-draft
ludamad
force-pushed
the
claudebox/fix-backport-rebase
branch
from
e95afe9 to
ba05d5e
Compare
ludamad
approved these changes
Mar 23, 2026
## Summary Fixes the issue where ClaudeBox backport PRs include unrelated commits (e.g., #21843). **Root cause**: ClaudeBox starts at `origin/next`, but backport work needs to happen on the staging branch (`backport-to-$BRANCH-staging`). Without explicit checkout of the staging branch, `create_pr` pushes from the wrong HEAD, leaking unrelated commits. Co-authored-by: ludamad <adam.domurad@gmail.com>
AztecBot
force-pushed
the
claudebox/fix-backport-rebase
branch
from
ba05d5e to
48745f8
Compare
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.
Summary
Fixes the issue where ClaudeBox backport PRs include unrelated commits (e.g., #21843).
Root cause: ClaudeBox starts at
origin/next, but backport work needs to happen on the staging branch (backport-to-$BRANCH-staging). Without explicit checkout of the staging branch,create_prpushes from the wrong HEAD, leaking unrelated commits.