skills.rest
devbasex
devbasexOFFICIAL
Explore all skills by this author →
GitHub

cherry-pick-pr

Creates cherry-pick pull requests applying merged fixes onto environment branches like qa or staging.

1|Updated Apr 21, 2026
Search Tags:#git#pull request#cherry-pick#release workflow#github cli#environment branch
One-click install
npx skills add https://github.com/devbasex/ai-plugins --skill cherry-pick-pr-devbasex
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: cherry-pick-pr
Source: https://github.com/devbasex/ai-plugins/tree/main/plugins/ndf/skills/cherry-pick-pr
Command: npx skills add https://github.com/devbasex/ai-plugins --skill cherry-pick-pr-devbasex

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? When the same fix must reach environment branches (qa/staging, release) in addition to the main development branch, merging environment branches back into a feature branch pollutes the original PR with environment-specific code. This Skill applies only the needed commits to the target environment branch via a short-lived branch and cherry-pick, keeping the feature branch as the single source of truth. ## Core Features & Use Cases - Short-lived branch workflow: Creates a <feature>-for-<env> branch from the target environment branch, cherry-picks selected commits with -x for traceability, and opens a PR against the environment branch. - Merged-PR collision check: Detects previously merged PRs with the same branch name and requires a suffix (e.g., -v2) to avoid branch reuse. - Base branch sync: Fetches and merges the development base branch before cherry-picking to prevent CI failures and conflicts. - Use Case: A bug fix merged into develop must also reach qa/staging for verification. Run the Skill with qa/staging as the argument to produce a clean cherry-pick PR containing only the fix commits. ## Quick Start Ask the AI to cherry-pick the current branch's commits onto the qa/staging branch and open a pull request for it.

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 to another branch and create a PR?▼

Create a short-lived branch from the target branch, cherry-pick the desired commits with git cherry-pick -x, push the branch, and open a PR with gh pr create. The -x flag records the original commit hash for traceability.

How to apply the same fix to qa and staging branches without merging?▼

Use cherry-pick from the feature branch onto a short-lived branch cut from each environment branch, then open separate PRs. This avoids merging environment branches into the feature branch, which would pollute the original PR.

Why should I not merge a staging branch into my feature branch?▼

Merging an environment branch into a feature branch pulls environment-specific code into the feature-to-develop PR, contaminating the single source of truth. Cherry-picking delivers only the needed commits to each target branch.

What happens if a cherry-pick branch name was already used in a merged PR?▼

The same branch name cannot be reused once its PR is merged. The workflow checks for merged PRs with the same head branch and requires a suffix such as -v2 or -v3 for the new branch.

How do I resolve conflicts during git cherry-pick?▼

List conflicting files with git diff --name-only --diff-filter=U, resolve them manually, then run git cherry-pick --continue after confirming the resolution. The Skill attempts resolution and asks the user before continuing.

Related Skills

Explore More Software Engineering Skills→
dotnetdotnet
1.2k

cherry-pick-commit

Cherry-pick commits onto release branches and open backport pull requests.

Official
Intermediate
takemi-ohamatakemi-ohama

branch-fix-strategy

Commit fixes on a feature branch and cherry-pick them to environment branches.

Community
Advanced
sduduzogsduduzog

git-advanced-workflows

Automate advanced Git workflows across branches for clean history.

Community
Intermediate
daniyarseifolladaniyarseifolla

community-sync

Distribute a commit from the current branch into all active community/* branches.

Community
Advanced