Agent skill

Cherry Pick

by openshift-eng in openshift-eng/ai-helpers

A skill your agent uses when the coordinator dispatches a BACKPORT BRIEF for a single branch.

Apache-2.0Auto-check passedDevelopment

Install Cherry Pick

skills CLI
$ npx skills add openshift-eng/ai-helpers --skill cherry-pick -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install openshift-eng/ai-helpers cherry-pick --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/openshift-eng/ai-helpers.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/openshift-developer/skills/cherry-pick .claude/skills/cherry-pick && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
cherry-pick
GitHub stars
120
Token cost
~579 tokens
SKILL.md length
271 words
Files
1
Skills in repo
118
Repo updated
First seen
Licence
Apache-2.0

At a glance

A skill your agent uses when the coordinator dispatches a BACKPORT BRIEF for a single branch.

  • Works in 7 steps: git fetch upstream (add upstream for the… → Fetch the source commits (git fetch… → git cherry-pick -x for each source… → …
  • The coordinator dispatches a BACKPORT BRIEF for a single branch
  • SKILL.md covers Name, Synopsis and Steps
  • Calls git and make

What it does

Cherry Pick is an agent skill from openshift-eng/ai-helpers. Use when the coordinator dispatches a BACKPORT BRIEF for a single branch. Cherry-picks the named commits onto an OpenShift release branch, resolves conflicts conservatively, runs the repository's checks, and pushes the branch to the bot's fork. Never opens a PR.

Its SKILL.md is about 580 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development. It works with Git. The repository describes itself as: Developer productivity tools for Claude Code & other AI assistants. The licence is Apache-2.0.

When your agent uses it

  • The coordinator dispatches a BACKPORT BRIEF for a single branch

Example prompts

  • “s checks, and pushes the branch to the bot”
  • “/cherry-pick”

Workflow steps

7 steps, taken from the first numbered list in SKILL.md.

  1. git fetch upstream (add upstream for the upstream
  2. Fetch the source commits (git fetch upstream pull//head covers PR
  3. git cherry-pick -x for each source commit, in order. Keep the
  4. On a conflict: resolve minimally, preserving the upstream change's
  5. Run the proportional checks the repository defines (make build,
  6. git push origin . Do NOT open a PR — the coordinator does,
  7. Report: the pushed branch, the commit shas on it, per-file conflict

What it can do on your machine

Read from SKILL.md and the folder at commit a627176. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • make

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Cherry Pick loads about 579 tokens when it runs. Until then it costs about 69 tokens; SKILL.md has 271 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~69
When it runs · the whole SKILL.md, loaded when a task matches
~579

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from openshift-eng/ai-helpers at commit a627176, republished under its Apache-2.0 licence (© openshift-eng). 271 words, ~579 tokens.

Download SKILL.mdSave it as .claude/skills/cherry-pick/SKILL.md (or your agent's skills folder).
name
cherry-pick
description
Use when the coordinator dispatches a BACKPORT BRIEF for a single branch. Cherry-picks the named commits onto an OpenShift release branch, resolves conflicts conservatively, runs the repository's checks, and pushes the branch to the bot's fork. Never opens a PR.

Name

openshift-developer:cherry-pick

Synopsis

text
/openshift-developer:cherry-pick <brief>

/openshift-developer:cherry-pick <brief>

The brief is authoritative: repository, target branch, source commits (in order), head branch name, and the fork remote are all decided by the coordinator's tools. Do not rename, retitle or reorder anything.

Steps

  1. git fetch upstream <target_branch> (add upstream for the upstream repository if the clone's origin is the fork) and git checkout -b <head_branch> upstream/<target_branch>.
  2. Fetch the source commits (git fetch upstream pull/<N>/head covers PR commits; a squash/merge commit sha is on the base branch). For source_mode: rebase, find each PR commit's rebased twin on the base branch by git patch-id and pick those.
  3. git cherry-pick -x <sha> for each source commit, in order. Keep the original authorship and message; the -x trailer is the only addition.
  4. On a conflict: resolve minimally, preserving the upstream change's intent on this branch's code. Regenerate vendor/, go.sum, lockfiles with the project's own commands, never by hand. Never drop or weaken a test. Consult the conflict_hints PRs (already-resolved newer backports) for how the same hunk was resolved — but never pick from them. If a conflict is not mechanically resolvable, stop: push what applies cleanly in order, report_setback("cherry_pick_conflict", <files and why>), and end with GOAL_VERDICT: blocked.
  5. Run the proportional checks the repository defines (make build, make test/make verify, or the language's equivalents). Fix only what the cherry-pick introduced.
  6. git push origin <head_branch>. Do NOT open a PR — the coordinator does, with the brief's title and body.
  7. Report: the pushed branch, the commit shas on it, per-file conflict notes (file, what conflicted, how you resolved it), test evidence, and a closing GOAL_VERDICT: achieved|blocked|failed line.

© openshift-eng, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in plugins/openshift-developer/skills/cherry-pick of openshift-eng/ai-helpers.

Open the folder on GitHubat commit a627176

Compare with similar skills

Cherry Pick next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Cherry Pick compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Cherry Pick this skillopenshift-eng/ai-helpers120—~579Automated safety check: PassApache-2.0
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Code Review ChecklistshareAI-lab/learn-claude-code78k5 repos~1.1kAutomated safety check: PassMIT
Codebase Knowledge Graph Q&AEgonex-AI/Understand-Anything85k1 repos~1.2kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Understand Diff AnalysisEgonex-AI/Understand-Anything85k1 repos~1.4kAutomated safety check: PassMIT

Similar skills

  • Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • Code Review Checklist

    shareAI-lab/learn-claude-code

    Reviews code against a five-part checklist covering security, correctness, performance, maintainability and testing, and reports findings in a fixed format.

    78k GitHub starsUsed in 5 repos~1.1k tokens
    DevelopmentAuto-check passed
  • Codebase Knowledge Graph Q&A

    Egonex-AI/Understand-Anything

    Answers questions about a codebase by searching a prebuilt knowledge graph of its files, functions, classes and dependencies, not by rereading every source file.

    85k GitHub starsUsed in 1 repo~1.2k tokens
    DevelopmentAuto-check passed
  • Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed
  • Understand Diff Analysis

    Egonex-AI/Understand-Anything

    Reads your git changes or a pull request against a prebuilt knowledge graph of the project to explain what changed, which components are affected and what is risky.

    85k GitHub starsUsed in 1 repo~1.4k tokens
    DevelopmentAuto-check passed
  • Understand Explain

    Egonex-AI/Understand-Anything

    Gives an in-depth explanation of one file, function or module by reading the project's knowledge graph and checking that the graph is still fresh.

    85k GitHub starsUsed in 1 repo~1.3k tokens
    DevelopmentAuto-check passed

More from openshift-eng/ai-helpers

All 118 skills in this repo
  • Investigate CI Reliability

    openshift-eng/ai-helpers

    Find and independently validate actionable reliability defects across OpenShift release jobs and presubmits, then export portable issue handoffs.

    120 GitHub stars~1.9k tokensUpdated yesterday
    Auto-check passed
  • Address Review PR

    openshift-eng/ai-helpers

    Fetch and address all PR review comments — categorize by priority, make code changes, post replies, and push.

    120 GitHub stars~2.9k tokensUpdated yesterday
    Auto-check passed
  • Categorize Activity Types

    openshift-eng/ai-helpers

    Categorize Jira issues into Red Hat Sankey Activity Type categories using MCP Jira tools.

    120 GitHub stars~2.4k tokensUpdated yesterday
    Auto-check passed
  • Has Review Work

    openshift-eng/ai-helpers

    Decide whether a GitHub PR has unanswered authorized review comments or new required CI failures worth a follow-up agent.

    120 GitHub stars~1.9k tokensUpdated yesterday
    Auto-check passed
  • Must Gather Analyzer

    openshift-eng/ai-helpers

    Analyze OpenShift must-gather diagnostic data including cluster operators, pods, nodes, and network components.

    120 GitHub stars~2.3k tokensUpdated yesterday
    Auto-check passed
  • Payload Autodl JSON

    openshift-eng/ai-helpers

    Schema for the autodl JSON data file produced by payload-analysis for database ingestion — you must use this skill whenever generating the autodl JSON file

    120 GitHub stars~2.6k tokensUpdated yesterday
    Auto-check passed

Works with

Categories

Questions about Cherry Pick

What does Cherry Pick do?

A skill your agent uses when the coordinator dispatches a BACKPORT BRIEF for a single branch. Cherry Pick is an agent skill from openshift-eng/ai-helpers. Use when the coordinator dispatches a BACKPORT BRIEF for a single branch.

When should I use Cherry Pick?

Cherry Pick fits situations like: the coordinator dispatches a BACKPORT BRIEF for a single branch.

How do I install Cherry Pick in Claude Code?

Run `npx skills add openshift-eng/ai-helpers --skill cherry-pick -a claude-code`. Or copy the skill folder (plugins/openshift-developer/skills/cherry-pick in openshift-eng/ai-helpers) into .claude/skills/cherry-pick in your project. Claude Code loads it when a task matches its description.

How do I install Cherry Pick in Codex?

Run `npx skills add openshift-eng/ai-helpers --skill cherry-pick -a codex`. Or copy the skill folder (plugins/openshift-developer/skills/cherry-pick in openshift-eng/ai-helpers) into .agents/skills/cherry-pick in your project. Codex loads it when a task matches its description.

Can I use Cherry Pick in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add openshift-eng/ai-helpers --skill cherry-pick -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/cherry-pick, .gemini/skills/cherry-pick, .github/skills/cherry-pick and .opencode/skills/cherry-pick in your project.

What does Cherry Pick need to run?

Going by SKILL.md and its folder, Cherry Pick needs the command-line tools its instructions call (git and make).

Does Cherry Pick access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Cherry Pick safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Cherry Pick use?

Cherry Pick is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Cherry Pick use?

About 579 tokens (SKILL.md is roughly 2.3k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Cherry Pick?

Skills that share tags, products or a category with Cherry Pick: Finishing a Development Branch (obra/superpowers, 296k stars), Code Review Checklist (shareAI-lab/learn-claude-code, 78k stars), Codebase Knowledge Graph Q&A (Egonex-AI/Understand-Anything, 85k stars) and Code Design Rationale Investigator (cursor/plugins, 10k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Cherry Pick?

openshift-eng (a GitHub organization) maintains it in openshift-eng/ai-helpers, which has 120 GitHub stars. The repository holds 118 skills in this directory. The repository was last updated on October 6, 2026.

Source: openshift-eng/ai-helpers on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.