skills.rest
loki495
loki495COMMUNITY
Explore all skills by this author →
GitHub

claude-import-cherry-pick-to

Cherry-pick selected commits to a production branch with divergence checks and rebase.

Updated Aug 25, 2017
Search Tags:#git#version control#rebase#cherry-pick#production branch#commit promotion#divergence check
One-click install
npx skills add https://github.com/loki495/dotfiles --skill claude-import-cherry-pick-to-loki495
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: claude-import-cherry-pick-to
Source: https://github.com/loki495/dotfiles/tree/main/ai/codex-skills/claude-import-cherry-pick-to
Command: npx skills add https://github.com/loki495/dotfiles --skill claude-import-cherry-pick-to-loki495

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Moving individual commits from a development branch to a production branch is error-prone: branches diverge, pushes happen without review, and local state gets lost. This Skill guides a controlled cherry-pick workflow with safety checks at each step. ## Core Features & Use Cases - Selective Commit Promotion: Cherry-pick only the chosen commits onto a production branch instead of merging everything. - Divergence Checks: Detects branch divergence before applying commits so conflicts surface early. - Push Confirmation & Restoration: Requests explicit confirmation immediately before any push and supports restoring state and rebasing afterward. - Use Case: A hotfix commit on your feature branch needs to reach production today, but the rest of the branch is not ready. Use this Skill to cherry-pick just that commit, verify divergence, and push only after confirmation. ## Quick Start Ask the assistant to cherry-pick specific commits to the production branch using the cherry-pick-to workflow, confirming before any push.

Frequently Asked Questions about claude-import-cherry-pick-to

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

FAQPage Schema
How do I cherry-pick specific commits to a production branch?▼

Cherry-picking copies individual commits onto another branch without merging everything. This Skill reads the cherry-pick-to command reference and git-workflow instructions, then applies the selected commits with divergence checks before pushing.

How to cherry-pick commits safely without losing local changes?▼

Safe cherry-picking requires checking branch divergence first and preserving the current state. This Skill performs divergence checks, supports restoration of the working state, and rebases afterward to keep history consistent.

Does this Skill push to the remote automatically?▼

No. The Skill explicitly requests user confirmation immediately before any push operation. Nothing is pushed to the remote production branch until you approve it.

What happens when branches have diverged during cherry-pick?▼

The Skill runs divergence checks before applying commits so conflicts and drift between branches surface early. After cherry-picking, it handles restoration and rebase to reconcile the branch state.

When should I cherry-pick instead of merging a branch?▼

Cherry-pick when only specific commits are ready for production but the rest of the branch is unfinished. Merging is better when the entire branch has been reviewed and should be integrated as a unit.

Related Skills

Explore More Software Engineering Skills→
luyzkkluyzkk

git-workflow-and-versioning

Enforce conventional commits, atomic save-point commits, and short-lived branches.

Community
Advanced
marcusgollmarcusgoll

production-deployment-phase

Promote validated staging deployments to production with semantic versioning and health checks.

Community
Advanced
RebornQRebornQ
52

trellis-check

Run spec compliance, lint, type-check, and test suites on new changes.

Community
Advanced
paywherebpaywhereb

squash

Squash all branch commits into one via interactive git rebase.

Official
Intermediate