Run any Skill in Manus with one click

$pwd:

cherry-pick

Name: Cherry Pick
Author: fleetdm

// Cherry-pick a merged PR into the current RC branch. Use when asked to "cherry-pick", "cp into RC", or after merging a PR that needs to go into the current release.

Run Skill in Manus

$ git log --oneline --stat

stars:6,414

forks:898

updated:April 7, 2026 at 16:49

SKILL.md

readonly

name	cherry-pick
description	Cherry-pick a merged PR into the current RC branch. Use when asked to "cherry-pick", "cp into RC", or after merging a PR that needs to go into the current release.
allowed-tools	Bash(git ), Bash(gh pr ), Bash(gh api *), Read, Grep, Glob
effort	low

Cherry-pick a merged PR into the current RC branch. Arguments: $ARGUMENTS

Usage: /cherry-pick <PR_NUMBER> [RC_BRANCH]

PR_NUMBER (required): The PR number to cherry-pick (e.g. 43078). If not provided, ask the user.
RC_BRANCH (optional): The target RC branch name (e.g. rc-minor-fleet-v4.83.0). If not provided, auto-detect the most recent one.

Step 1: Ensure main is up to date

git fetch origin
git checkout main
git pull origin main

Step 2: Identify the RC branch

If an RC branch was provided as the second argument, use it (but still confirm with the user before proceeding).

Otherwise, auto-detect by listing both minor and patch RC branches:

git for-each-ref 'refs/remotes/origin/rc-minor-fleet-v*' 'refs/remotes/origin/rc-patch-fleet-v*' --format='%(refname:strip=3)' | grep -E '^rc-(minor|patch)-fleet-v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V

From the results, suggest the most recent rc-minor-fleet-v* branch as the default. If patch branches also exist, mention them as alternatives. Always ask the user to confirm the target RC branch before proceeding.

Step 3: Get the merge commit and GitHub username

Get the PR title:

gh pr view <PR_NUMBER> --json title --jq .title

Get the merge commit SHA:
```
gh pr view <PR_NUMBER> --json mergeCommit --jq .mergeCommit.oid
```
If this returns null or an empty value, the PR is not yet merged. Tell the user and stop.
Get the GitHub username: gh api user --jq .login

Step 4: Cherry-pick onto a new branch

Create a new branch off the RC branch:
```
git checkout -b <github-username>/<short-description>-cp origin/<rc-branch>
```
Derive <short-description> from the PR title (lowercase, hyphens, keep it short — 3-5 words max).
Check whether the commit is a merge commit by inspecting its parents:
```
git rev-list --parents -n 1 <merge-commit-SHA>
```
If the commit has multiple parents, run:
```
git cherry-pick -m 1 <merge-commit-SHA>
```
Otherwise (squash-merged or rebased), run:
```
git cherry-pick <merge-commit-SHA>
```
If there are conflicts, stop and tell the user which files conflict. Do NOT attempt to resolve them automatically.

Step 5: Push and open PR

Push the branch: git push -u origin HEAD

Open a PR targeting the RC branch (NOT main):

gh pr create --base <rc-branch> --title "Cherry-pick #<PR_NUMBER>: <original-title>" --body "$(cat <<'EOF'
Cherry-pick of #<PR_NUMBER> into the RC branch.
EOF
)"

Report the PR URL to the user.

related-skills.json

same repository

new-fma.md

from "fleetdm/fleet"

Add a Fleet-maintained app (FMA) for macOS (Homebrew) and/or Windows (winget). Use when asked to "add X as a macOS/Windows FMA", "add a Fleet-maintained app", or to debug FMA validator failures. Emphasizes verifying installer metadata with real tools (msitools, plist) instead of guessing.

2026-05-286.4k

who-blocks-this-pr.md

from "fleetdm/fleet"

Analyze a PR to determine which files still need approval and from whom, based on CODEOWNERS and website/config/custom.js. Use when the user asks "who needs to approve", "why is the PR blocked", "who blocks this PR", or similar.

2026-05-186.4k

release-retro.md

from "fleetdm/fleet"

Format release retro notes for a Fleet working group into a Slack recap post and ~timebox GitHub issues. Use when asked to "post retro recap", "format retro notes", "create release retro", or after a retrospective when feedback needs to land in Slack and action items need to be tracked.

2026-05-156.4k

cherry-pick.md

from "fleetdm/fleet"

Cherry-pick a merged PR onto a release candidate branch and open a new PR. Use when asked to cherry-pick, backport, or port a PR to an rc-minor or rc-patch branch.

2026-04-286.4k

feature-request.md

from "fleetdm/fleet"

Open a new Fleet feature request GitHub issue using the official fleetdm/fleet feature-request template. Use this skill whenever someone says "new feature request", "submit a feature request", "open a feature request", "create a feature request", "I want to request a feature", "feature request for...", or any similar phrasing indicating they want to file a new feature idea or product improvement with the Fleet team. Always use this skill — never construct issue body text yourself or link to the template without a pre-filled title and body.

2026-04-226.4k

bump-migration.md

from "fleetdm/fleet"

Bump a database migration's timestamp to the current time. Required when a PR's migration is older than one already merged to main. Use when asked to "bump migration", "update migration timestamp", or when a migration ordering conflict is detected.

2026-04-066.4k

package.json

"author": "fleetdm"

"repository": "fleetdm/fleet"

View GitHub Repository View Creator Repositories

$ install --global

$ download --local

Run Skill in Manus

$ useful --forSOC

Software DevelopersComputer and Mathematical Occupations15-1252L4

name	cherry-pick
description	Cherry-pick a merged PR into the current RC branch. Use when asked to "cherry-pick", "cp into RC", or after merging a PR that needs to go into the current release.
allowed-tools	Bash(git ), Bash(gh pr ), Bash(gh api *), Read, Grep, Glob
effort	low

Cherry-pick a merged PR into the current RC branch. Arguments: $ARGUMENTS

Usage: /cherry-pick <PR_NUMBER> [RC_BRANCH]

PR_NUMBER (required): The PR number to cherry-pick (e.g. 43078). If not provided, ask the user.
RC_BRANCH (optional): The target RC branch name (e.g. rc-minor-fleet-v4.83.0). If not provided, auto-detect the most recent one.

Step 1: Ensure main is up to date

git fetch origin
git checkout main
git pull origin main

Step 2: Identify the RC branch

If an RC branch was provided as the second argument, use it (but still confirm with the user before proceeding).

Otherwise, auto-detect by listing both minor and patch RC branches:

git for-each-ref 'refs/remotes/origin/rc-minor-fleet-v*' 'refs/remotes/origin/rc-patch-fleet-v*' --format='%(refname:strip=3)' | grep -E '^rc-(minor|patch)-fleet-v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V

Step 3: Get the merge commit and GitHub username

Get the PR title:

gh pr view <PR_NUMBER> --json title --jq .title

Get the merge commit SHA:
```
gh pr view <PR_NUMBER> --json mergeCommit --jq .mergeCommit.oid
```
If this returns null or an empty value, the PR is not yet merged. Tell the user and stop.
Get the GitHub username: gh api user --jq .login

Step 4: Cherry-pick onto a new branch

Create a new branch off the RC branch:
```
git checkout -b <github-username>/<short-description>-cp origin/<rc-branch>
```
Derive <short-description> from the PR title (lowercase, hyphens, keep it short — 3-5 words max).
Check whether the commit is a merge commit by inspecting its parents:
```
git rev-list --parents -n 1 <merge-commit-SHA>
```
If the commit has multiple parents, run:
```
git cherry-pick -m 1 <merge-commit-SHA>
```
Otherwise (squash-merged or rebased), run:
```
git cherry-pick <merge-commit-SHA>
```
If there are conflicts, stop and tell the user which files conflict. Do NOT attempt to resolve them automatically.

Step 5: Push and open PR

Push the branch: git push -u origin HEAD

Open a PR targeting the RC branch (NOT main):

gh pr create --base <rc-branch> --title "Cherry-pick #<PR_NUMBER>: <original-title>" --body "$(cat <<'EOF'
Cherry-pick of #<PR_NUMBER> into the RC branch.
EOF
)"

Report the PR URL to the user.

cherry-pick

Step 1: Ensure main is up to date

Step 2: Identify the RC branch

Step 3: Get the merge commit and GitHub username

Step 4: Cherry-pick onto a new branch

Step 5: Push and open PR

More from this repository

More from this repository

Step 1: Ensure main is up to date

Step 2: Identify the RC branch

Step 3: Get the merge commit and GitHub username

Step 4: Cherry-pick onto a new branch

Step 5: Push and open PR