cherry-pick-pr

Create a cherry-pick pull request from a feature branch to a base branch.

Updated Jan 30, 2026
One-click install
npx skills add https://github.com/takemi-ohama/ai-plugins --skill cherry-pick-pr-takemi-ohama
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: cherry-pick-pr
Source: https://github.com/takemi-ohama/ai-plugins/tree/main/plugins/ndf/skills/cherry-pick-pr
Command: npx skills add https://github.com/takemi-ohama/ai-plugins --skill cherry-pick-pr-takemi-ohama

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

featureブランチのコミットを別ベースブランチへcherry-pickする。mainへのPRで環境ブランチ固有のコードが混入するのを防ぐため、短命ブランチ経由のワークフローを提供します。

Core Features & Use Cases

  • 環境ブランチの混入を回避するための cherry-pick PR 作成
  • 引数検証・短命ブランチの自動作成・main の取り込み・cherry-pick 実行・PR 生成を統合的にサポート
  • 実運用ケース: feature ブランチの特定コミットのみを対象ブランチへ適用し、main 汚染を防ぐ

Quick Start

指定ベースブランチへ feature ブランチのコミットを cherry-pick PR として作成してください。

Frequently Asked Questions about cherry-pick-pr

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I cherry-pick commits from a feature branch to a staging branch without contaminating main?

To cherry-pick commits without contaminating main, this Skill creates a short-lived branch from your designated base branch, merges main into it, applies the selected commits, and generates a structured pull request. This isolates environment-specific changes from the main branch.

Why do environment-specific changes leak into my main pull requests?

Environment-specific changes leak when feature branches contain commits meant only for branches like qa or staging. This Skill prevents main contamination by routing selected commits through a short-lived branch directly to the target environment branch as an isolated cherry-pick pull request.

What is the best way to automate creating a cherry-pick pull request for release branches?

The best way to automate a cherry-pick pull request is using a workflow that validates arguments, creates a short-lived branch, merges main, applies the cherry-picked commits, and opens a PR with a structured summary. This Skill performs that integrated workflow for release branches.

Can I use a short-lived branch workflow to isolate qa-specific code from my feature branch?

Yes, you can isolate qa-specific code by targeting a designated base branch. The Skill creates a short-lived branch, cherry-picks the selected feature branch commits, and generates a pull request to merge them directly into your qa branch, keeping main clean.

Do I need to manually merge main before cherry-picking commits to another branch?

No, you do not need to manually merge main. The Skill automatically merges main into the newly created short-lived branch before applying the cherry-picked commits, ensuring the target branch is up to date and reducing integration conflicts.

What limitations exist when cherry-picking specific commits across environment branches?

A key limitation is that the Skill requires valid argument inputs for the target base branch and specific commits. It is designed for environment branches like qa, staging, or release, and relies on a structured pull request workflow rather than direct pushes.