feat(skills): add backport bundled skill#169
Merged
emal-avala merged 1 commit intomainfrom Apr 23, 2026
Merged
Conversation
Cherry-picks a commit or PR onto one or more release branches, each in its own worktree. Guardrails baked into the prompt: - one worktree per target branch (don't contaminate the current tree) - mechanical conflict resolution only (trivial renames, import reorders); anything needing judgment STOPS on that branch - run the target branch's test + lint gate — the fix may depend on newer-branch code that doesn't exist on the older branch - push to backport/<source>-onto-<target> branch and open a PR linking the original - summary table at the end: target | backport PR or failure | clean or had-conflicts - never force-push, never squash without reviewer sign-off, never mark complete if tests failed
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
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.
Summary
Adds `/backport` — cherry-picks a commit or PR onto one or more release branches. One isolated worktree per branch, per-target verification, conflicts that need judgment stop rather than guess.
Guardrails in the prompt:
Why
Backports across `release/1.14`, `release/1.15`, `release/1.16` are a common post-fix chore. Without a skill, the agent tends to either try everything in the current working tree (contaminating it) or silently skip failing targets. The `batch` skill covers the parallel-worktree workflow for arbitrary changes; `backport` specializes it for `git cherry-pick` with PR creation baked in.
Complements `/batch` (PR #162) for the cherry-pick-and-open-PR flow specifically.
Test plan