cherry-pick

星标6,637

分支955

更新时间2026年4月7日 16:49

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.

安装

用 Codex 或 Claude 帮你安装复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。

来源

fleetdm

fleetdm/fleet

打开 GitHub 仓库查看创作者相关仓库

下载

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.

同仓库更多 Skills

同仓库

fleet-article-formatting

fleetdm/fleet

Apply Fleet's house article format and article-specific voice to Fleet ARTICLES — blog pieces with meta category "articles" or "comparison" (thought-leadership, how-to, and comparison pieces). Use when writing a NEW article or editing, refreshing, or tightening an EXISTING one, even if the user doesn't say "use the format." Governs structure and article-specific voice; pair with content-style for word-level voice. Do NOT use for guides, case studies, or announcements — those are separate content types with their own skills.

2026-07-216.6k

aikido-tickets

fleetdm/fleet

Create GitHub issues in fleetdm/confidential for Aikido pen test findings. Use when asked to "create aikido tickets", "aikido ticket", or "create pen test tickets".

2026-07-176.6k

content-style

fleetdm/fleet

Write, edit, and review any public-facing or customer/prospect-facing Fleet content so it follows Fleet's writing, brand, voice, and style guidelines. Use this whenever you create or change the words in website copy (fleetdm.com), handbook pages, docs, guides, tutorials, articles, blog posts, announcements, release notes, product UI text and microcopy, GitHub issues about content, or marketing and sales enablement material, even if the user never says "style guide." Trigger on edits under website/, handbook/, docs/, articles/, and on requests like "write a blog post," "draft an announcement," "review this guide for style," "make this sound like Fleet," "tighten this up," or "clean up this copy." This skill is for authoring and editing prose for voice, brand, and style. It does not apply to writing code, tests, scripts, commit messages, or internal team chat, even when those happen to mention articles, announcements, blog posts, or UI strings.

2026-07-076.6k

push-reference-docs

fleetdm/fleet

Move reference doc updates from one release docs branch to another (e.g., 4.89 → 4.90) when a feature is pushed to a later release. Handles three PR states — open (retarget), closed-without-merge (apply-only), merged (revert + apply).

2026-07-016.6k

spec-story

fleetdm/fleet

Break down a Fleet GitHub story issue into implementable sub-issues with technical specs. Use when asked to "spec", "break down", or "analyze" a story or issue.

2026-06-306.6k

command-palette

fleetdm/fleet

Authoring guide for the Fleet command palette. Use when adding or editing items in frontend/components/CommandPalette/groups/, when editing frontend/router/paths.ts or frontend/router/index.tsx, or when adding a new top-level page, global create action, MDM connector / singleton config, automation hook, or picker action that needs a palette entry.

2026-06-126.6k

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.