Cherry-Pick to Release Branch
Cherry-pick a commit from origin/main into a release branch using a temporary git worktree.
Resume Check
Before starting, check if there is an existing cherry-pick worktree from a previous run:
git worktree list | grep cherry-pick/
If there is a worktree on a cherry-pick/* branch, a previous cherry-pick may have stopped due to conflicts. Ask the user if they want to resume it. If yes:
- Set
WORKTREE_DIR to the existing worktree path.
- Check the cherry-pick state:
git -C "$WORKTREE_DIR" status
- If the cherry-pick is still in progress (conflicts resolved, staged), run
git -C "$WORKTREE_DIR" cherry-pick --continue to finalize.
- If the working tree is clean (cherry-pick already completed), proceed to push.
- Recover the original source commit SHA from the worktree's branch name (it's encoded as
cherry-pick/<source-sha>-to-<release-branch>):BRANCH=$(git -C "$WORKTREE_DIR" branch --show-current)
SOURCE_SHA=${BRANCH#cherry-pick/}
SOURCE_SHA=${SOURCE_SHA%-to-*}
Do NOT use the worktree's HEAD SHA — that's the new cherry-pick commit, not the original. Then run step 4 with $SOURCE_SHA to gather the original PR metadata.
- Continue from step 10 (push) onward.
If the user does not want to resume, clean up the stale worktree first, then start fresh.
Steps
Fetch latest from origin:
git fetch origin
Show recent commits on origin/main:
Run git log origin/main --oneline -20 to get the list.
Ask the user which commit to cherry-pick:
Use AskUserQuestion to present the recent commits as options. Let the user select one.
Look up the original PR for the selected commit:
gh pr view does not accept a commit SHA, so query the commits→pulls API directly:
gh api repos/ai-dynamo/aiperf/commits/<source-commit-sha>/pulls \
--jq '.[0] | "\(.number)\t\(.title)"'
Save the PR number and title for use in steps 11 and 13. If the commit message contains a PR number (e.g. (#669)), you can also use that directly.
Find all release branches:
Run git branch -r --list 'origin/release/*' to get all remote release branches matching release/X.X.X.
Ask the user which release branch to target:
Use AskUserQuestion to present the release branches as options. The most recent version (highest semver) should be the first option marked as "(Recommended)".
Create a temporary worktree on a feature branch:
Release branches are protected, so work on a cherry-pick/ feature branch from the start.
This also makes the worktree identifiable for resume if conflicts occur.
WORKTREE_DIR=$(mktemp -d)
git worktree add "$WORKTREE_DIR" origin/<release-branch>
git -C "$WORKTREE_DIR" checkout -b cherry-pick/<commit-hash>-to-<release-branch>
Set up the environment in the worktree (required for pre-commit hooks):
make -C "$WORKTREE_DIR" first-time-setup
Cherry-pick the commit:
git -C "$WORKTREE_DIR" cherry-pick <commit-hash>
If there are conflicts:
- Do NOT force resolve conflicts automatically.
- Do NOT clean up the worktree — leave it in place so the user can fix conflicts.
- Tell the user:
- The worktree path:
$WORKTREE_DIR
- To resolve conflicts in that directory, stage the fixes, then run:
git -C "$WORKTREE_DIR" cherry-pick --continue
- If conflict resolution requires a separate commit (not
cherry-pick --continue), use git commit -s with a HEREDOC message.
- Once resolved, re-run
/cherry-pick to resume (it will detect the existing worktree).
Push the feature branch:
git -C "$WORKTREE_DIR" push -u origin HEAD
Create PR (optional — requires gh CLI):
If gh is available and authenticated, create the PR automatically:
gh pr create \
--repo ai-dynamo/aiperf \
--head cherry-pick/<commit-hash>-to-<release-branch> \
--base <release-branch> \
--label cherry-pick \
--title "<original commit title> (cherry-pick to <release-branch>)" \
--body "$(cat <<'EOF'
## Summary
- Cherry-pick of <commit-hash> from `main` into `<release-branch>`
- Original PR: #<original-pr-number> — <original commit title>
## Conflicts
<If conflicts were resolved, list the files and briefly describe the resolution. Otherwise write "None — clean cherry-pick.">
EOF
)"
If gh is not set up or the command fails, skip this step and tell the user to create the PR manually at:
https://github.com/ai-dynamo/aiperf/compare/<release-branch>...cherry-pick/<commit-hash>-to-<release-branch>
Clean up the worktree:
git worktree remove "$WORKTREE_DIR"
Print a summary. Output the following (NOT inside a code block):
Cherry-pick complete: <commit-hash-short> → <release-branch>
PR Main: :git-merged: https://github.com/ai-dynamo/aiperf/pull/
PR Release: :pr-opened: https://github.com/ai-dynamo/aiperf/pull/
If step 11 was skipped (no PR created), omit the PR Release line and instead print the manual comparison URL from step 11's fallback.
Rules
- NEVER add a
Co-Authored-By line
- NEVER manually add a
Signed-off-by line — git commit -s handles this automatically
- If the cherry-pick results in a new commit (e.g. conflict resolution), use
git commit -s with a HEREDOC message
- NEVER use
--no-verify
- NEVER force push
- NEVER use
git stash, git reset, git revert, git checkout -- <file>, git restore, or git clean
- Always clean up the worktree after a successful push or if the user abandons the cherry-pick
- On cherry-pick conflicts: do NOT clean up the worktree — leave it for the user to resolve, then resume
- If anything else fails, clean up the worktree and report the error to the user
1---2name: cherry-pick3description: Cherry-pick a commit from origin/main into a release branch using a temporary git worktree4disable-model-invocation: true5allowed-tools: Bash(git fetch *), Bash(git log *), Bash(git branch *), Bash(git worktree *), Bash(git cherry-pick *), Bash(git -C * status), Bash(git -C * cherry-pick *), Bash(git -C * checkout *), Bash(git -C * push *), Bash(git -C * branch *), Bash(git push *), Bash(git commit *), Bash(git checkout *), Bash(mktemp *), Bash(make *), Bash(gh pr create *), Bash(gh api *), AskUserQuestion6metadata:7 source: https://skillmd.com/skills/ai-dynamo/cherry-pick8---910# Cherry-Pick to Release Branch1112Cherry-pick a commit from `origin/main` into a release branch using a temporary git worktree.1314## Resume Check1516Before starting, check if there is an existing cherry-pick worktree from a previous run:17```bash18git worktree list | grep cherry-pick/19```20If there is a worktree on a `cherry-pick/*` branch, a previous cherry-pick may have stopped due to conflicts. Ask the user if they want to resume it. If yes:211. Set `WORKTREE_DIR` to the existing worktree path.222. Check the cherry-pick state:23 ```bash24 git -C "$WORKTREE_DIR" status25 ```26 - If the cherry-pick is still in progress (conflicts resolved, staged), run `git -C "$WORKTREE_DIR" cherry-pick --continue` to finalize.27 - If the working tree is clean (cherry-pick already completed), proceed to push.283. Recover the original source commit SHA from the worktree's branch name (it's encoded as `cherry-pick/<source-sha>-to-<release-branch>`):29 ```bash30 BRANCH=$(git -C "$WORKTREE_DIR" branch --show-current)31 SOURCE_SHA=${BRANCH#cherry-pick/}32 SOURCE_SHA=${SOURCE_SHA%-to-*}33 ```34 Do NOT use the worktree's HEAD SHA — that's the new cherry-pick commit, not the original. Then run step 4 with `$SOURCE_SHA` to gather the original PR metadata.354. Continue from step 10 (push) onward.3637If the user does not want to resume, clean up the stale worktree first, then start fresh.3839## Steps40411. **Fetch latest from origin:**42 ```bash43 git fetch origin44 ```45462. **Show recent commits on origin/main:**47 Run `git log origin/main --oneline -20` to get the list.48493. **Ask the user which commit to cherry-pick:**50 Use `AskUserQuestion` to present the recent commits as options. Let the user select one.51524. **Look up the original PR for the selected commit:**53 `gh pr view` does not accept a commit SHA, so query the commits→pulls API directly:54 ```bash55 gh api repos/ai-dynamo/aiperf/commits/<source-commit-sha>/pulls \56 --jq '.[0] | "\(.number)\t\(.title)"'57 ```58 Save the PR number and title for use in steps 11 and 13. If the commit message contains a PR number (e.g. `(#669)`), you can also use that directly.59605. **Find all release branches:**61 Run `git branch -r --list 'origin/release/*'` to get all remote release branches matching `release/X.X.X`.62636. **Ask the user which release branch to target:**64 Use `AskUserQuestion` to present the release branches as options. The most recent version (highest semver) should be the first option marked as "(Recommended)".65667. **Create a temporary worktree on a feature branch:**67 Release branches are protected, so work on a `cherry-pick/` feature branch from the start.68 This also makes the worktree identifiable for resume if conflicts occur.69 ```bash70 WORKTREE_DIR=$(mktemp -d)71 git worktree add "$WORKTREE_DIR" origin/<release-branch>72 git -C "$WORKTREE_DIR" checkout -b cherry-pick/<commit-hash>-to-<release-branch>73 ```74758. **Set up the environment in the worktree (required for pre-commit hooks):**76 ```bash77 make -C "$WORKTREE_DIR" first-time-setup78 ```79809. **Cherry-pick the commit:**81 ```bash82 git -C "$WORKTREE_DIR" cherry-pick <commit-hash>83 ```84 If there are conflicts:85 - Do NOT force resolve conflicts automatically.86 - Do NOT clean up the worktree — leave it in place so the user can fix conflicts.87 - Tell the user:88 1. The worktree path: `$WORKTREE_DIR`89 2. To resolve conflicts in that directory, stage the fixes, then run: `git -C "$WORKTREE_DIR" cherry-pick --continue`90 3. If conflict resolution requires a separate commit (not `cherry-pick --continue`), use `git commit -s` with a HEREDOC message.91 4. Once resolved, re-run `/cherry-pick` to resume (it will detect the existing worktree).929310. **Push the feature branch:**94 ```bash95 git -C "$WORKTREE_DIR" push -u origin HEAD96 ```979811. **Create PR (optional — requires `gh` CLI):**99 If `gh` is available and authenticated, create the PR automatically:100 ```bash101 gh pr create \102 --repo ai-dynamo/aiperf \103 --head cherry-pick/<commit-hash>-to-<release-branch> \104 --base <release-branch> \105 --label cherry-pick \106 --title "<original commit title> (cherry-pick to <release-branch>)" \107 --body "$(cat <<'EOF'108 ## Summary109 - Cherry-pick of <commit-hash> from `main` into `<release-branch>`110 - Original PR: #<original-pr-number> — <original commit title>111112 ## Conflicts113 <If conflicts were resolved, list the files and briefly describe the resolution. Otherwise write "None — clean cherry-pick.">114 EOF115 )"116 ```117 If `gh` is not set up or the command fails, skip this step and tell the user to create the PR manually at:118 `https://github.com/ai-dynamo/aiperf/compare/<release-branch>...cherry-pick/<commit-hash>-to-<release-branch>`11912012. **Clean up the worktree:**121 ```bash122 git worktree remove "$WORKTREE_DIR"123 ```12412513. **Print a summary.** Output the following (NOT inside a code block):126127 Cherry-pick complete: `<commit-hash-short>` → `<release-branch>`128 <original commit title>129130 PR Main: <original-pr-number> :git-merged: https://github.com/ai-dynamo/aiperf/pull/<original-pr-number>131 PR Release: <cherry-pick-pr-number> :pr-opened: https://github.com/ai-dynamo/aiperf/pull/<cherry-pick-pr-number>132133 If step 11 was skipped (no PR created), omit the PR Release line and instead print the manual comparison URL from step 11's fallback.134135## Rules136137- NEVER add a `Co-Authored-By` line138- NEVER manually add a `Signed-off-by` line — `git commit -s` handles this automatically139- If the cherry-pick results in a new commit (e.g. conflict resolution), use `git commit -s` with a HEREDOC message140- NEVER use `--no-verify`141- NEVER force push142- NEVER use `git stash`, `git reset`, `git revert`, `git checkout -- <file>`, `git restore`, or `git clean`143- Always clean up the worktree after a successful push or if the user abandons the cherry-pick144- On cherry-pick conflicts: do NOT clean up the worktree — leave it for the user to resolve, then resume145- If anything else fails, clean up the worktree and report the error to the user