Run any Skill in Manus with one click

cherry-pick-pr

Stars294

Forks334

UpdatedApril 10, 2026 at 07:18

Cherry-pick a merged pull request onto a release branch with Prow-style branch naming, manual conflict resolution, targeted validation, and GitHub PR creation. Use when the user wants to backport a PR, cherry-pick a commit to a release branch, or mentions cherry-pick, backport, or porting a fix to an older release.

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Run Skill in Manus

Source

kubernetes-sigs

kubernetes-sigs/cloud-provider-azure

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

File Explorer

2 files

SKILL.md

readonly

name	cherry-pick-pr
description	Cherry-pick a merged pull request onto a release branch with Prow-style branch naming, manual conflict resolution, targeted validation, and GitHub PR creation. Use when the user wants to backport a PR, cherry-pick a commit to a release branch, or mentions cherry-pick, backport, or porting a fix to an older release.

Cherry-Pick Pull Requests

When To Use

Use this skill when you need to cherry-pick a merged PR onto a release branch and want the agent to handle the git and GitHub workflow while keeping conflict resolution and test decisions in the loop.

Workflow

Replace <SKILL_DIR> with the path to this skill directory.

Run a dry-run first:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
  --pr <number> \
  --target-branch <release-X.Y> \
  --dry-run

Start the cherry-pick from a clean working tree:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
  --pr <number> \
  --target-branch <release-X.Y>

If pick exits with code 3, inspect the conflicted files from the output, read the source diff with gh pr diff <number>, resolve the conflicts, stage the files with git add, then continue:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py continue

Run targeted validation after a clean cherry-pick:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py test

Create the PR only after test reports success:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py create-pr

Abandon a failed or stale attempt with:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py abort

Notes

The script refuses to start pick from a dirty working tree.
The script refuses to start a new attempt while .git/cherry-pick-pr.json exists. Run abort first.
The state file lives under .git/ intentionally so it stays untracked.
continue runs git cherry-pick --continue non-interactively.
test records passed, failed, or build_failed so the agent can tell the difference between test failures and target-branch compatibility issues.
create-pr reads .github/PULL_REQUEST_TEMPLATE.md at runtime and fails if required anchors drift.
create-pr expects the source PR to already carry a kind/... label. If it does not, fix that first or update the source PR metadata before creating the cherry-pick PR.
Use --chain <branch>... on pick when you want the resulting PR body to append a follow-up /cherrypick ... command for later serialized backports.

More from this repository

same repository

fix-image-cves

kubernetes-sigs/cloud-provider-azure

Scan a built container image with Trivy, classify fixable Go-module and base-image CVEs, apply dependency and Dockerfile fixes, and verify the result with file checks and an optional image rescan. Use when the user wants to fix CVEs in a container image, scan for vulnerabilities, or mentions Trivy, CVE remediation, image security, or dependency vulnerabilities.

2026-07-15294

unblock-dependabot-pr

kubernetes-sigs/cloud-provider-azure

Diagnose and unblock failed Dependabot pull requests in cloud-provider-azure by closing Kubernetes minor-version dependency bumps, classifying CI failures, syncing Go modules, retesting quota-flaked e2e jobs, and updating PR status. Use when a Dependabot PR fails go-mod-consistency, pull-cloud-provider-azure-e2e jobs, or dependency/toolchain CI.

2026-07-13294

build-images

kubernetes-sigs/cloud-provider-azure

Build cloud-provider-azure container images through the repo Makefile with explicit IMAGE_TAG and IMAGE_REGISTRY inputs plus optional make flag overrides. Use when the user wants to build CCM, CNM, health-probe-proxy, CCM e2e, or root CCM/CNM aggregate images, or mentions build-ccm-image, build-node-image-linux, build images, image registry, or image tag.

2026-06-29294

debug-e2e-pipeline

kubernetes-sigs/cloud-provider-azure

Fetch and analyze Prow e2e pipeline failures for cloud-provider-azure. Downloads build logs, JUnit reports, and node-level artifacts from GCS, extracts failed tests, parses Ginkgo results, and surfaces cluster node info. Use when debugging a failing Prow e2e job, investigating a cloud-provider-azure-ccm-windows-capz or cloud-provider-azure-master-capz build, triaging CI failures, or when the user pastes a prow.k8s.io URL.

2026-06-18294

sync-go-modules

kubernetes-sigs/cloud-provider-azure

Synchronize all tracked Go modules with the go-mod-consistency CI and refresh the root vendor tree. Use when go-mod-consistency fails, dependency bumps leave go.mod or go.sum stale, or the user asks to unblock module consistency, tidy all modules, or update vendor for the main module.

2026-05-16294

create-release-note-doc-pr

kubernetes-sigs/cloud-provider-azure

Generate or update the documentation-site release note for a given tag, commit it on a branch, push it to a writable remote, and open a GitHub PR to the docs branch. Use when the user wants to create or update release notes, generate a changelog for a tag, or mentions release notes, docs PR, or documentation for a release.

2026-05-15294

name	cherry-pick-pr
description	Cherry-pick a merged pull request onto a release branch with Prow-style branch naming, manual conflict resolution, targeted validation, and GitHub PR creation. Use when the user wants to backport a PR, cherry-pick a commit to a release branch, or mentions cherry-pick, backport, or porting a fix to an older release.

Cherry-Pick Pull Requests

When To Use

Workflow

Replace <SKILL_DIR> with the path to this skill directory.

Run a dry-run first:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
  --pr <number> \
  --target-branch <release-X.Y> \
  --dry-run

Start the cherry-pick from a clean working tree:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py pick \
  --pr <number> \
  --target-branch <release-X.Y>

If pick exits with code 3, inspect the conflicted files from the output, read the source diff with gh pr diff <number>, resolve the conflicts, stage the files with git add, then continue:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py continue

Run targeted validation after a clean cherry-pick:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py test

Create the PR only after test reports success:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py create-pr

Abandon a failed or stale attempt with:

python3 <SKILL_DIR>/scripts/cherry_pick_pr.py abort

Notes

The script refuses to start pick from a dirty working tree.
The script refuses to start a new attempt while .git/cherry-pick-pr.json exists. Run abort first.
The state file lives under .git/ intentionally so it stays untracked.
continue runs git cherry-pick --continue non-interactively.
test records passed, failed, or build_failed so the agent can tell the difference between test failures and target-branch compatibility issues.
create-pr reads .github/PULL_REQUEST_TEMPLATE.md at runtime and fails if required anchors drift.
create-pr expects the source PR to already carry a kind/... label. If it does not, fix that first or update the source PR metadata before creating the cherry-pick PR.
Use --chain <branch>... on pick when you want the resulting PR body to append a follow-up /cherrypick ... command for later serialized backports.