skills.rest
erigontech
erigontechOFFICIAL
Explore all skills by this author →
WebsiteGitHub

erigon-cherry-pick

Cherry-pick pull requests between long-living git branches and create separate GitHub PRs.

3.6k|1.5k|Updated May 27, 2019
Search Tags:#Git#cherry-pick#gitHub#erigon#backport#release branch#Pull request
One-click install
npx skills add https://github.com/erigontech/erigon --skill erigon-cherry-pick
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: erigon-cherry-pick
Source: https://github.com/erigontech/erigon/tree/main/.claude/skills/erigon-cherry-pick
Command: npx skills add https://github.com/erigontech/erigon --skill erigon-cherry-pick

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Maintaining multiple long-living branches (such as release branches and main) requires manually porting merged pull requests across them, which is repetitive and error-prone when done by hand.

Core Features & Use Cases

  • Cross-Branch Cherry-Picking: Picks commits from merged PRs on one branch (e.g., release/3.4) and applies them to another branch (e.g., main).
  • Automated PR Creation: Creates separate GitHub pull requests for each cherry-picked change, referencing the original PR instead of writing lengthy descriptions.
  • Clean Attribution: Produces unsigned commits without adding the operator's name, keeping history consistent with project conventions.
  • Use Case: After a bugfix PR merges into release/3.4, use this Skill to port it to main as its own PR that references the original change.

Quick Start

Cherry-pick the merged PRs from release/3.4 into main and open a separate GitHub PR for each one referencing the original PR.

Frequently Asked Questions about erigon-cherry-pick

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

FAQPage Schema
How do I cherry-pick PRs from a release branch to main?▼

Cherry-pick the merged PR commits from the source branch (e.g., release/3.4) onto the target branch (e.g., main), then open a separate GitHub PR for each change. Each new PR should reference the original PR rather than duplicating its description.

How to backport a merged pull request to another git branch?▼

Backporting is done by cherry-picking the original PR's commits onto the target branch and creating a new pull request that links back to the original. This keeps each ported change reviewable and traceable.

Should cherry-picked PRs include the original PR description?▼

No, a lengthy description is unnecessary. The new PR only needs to reference the original PR so reviewers can follow the link for full context and discussion history.

Can cherry-picking cause merge conflicts between branches?▼

Yes, conflicts occur when the target branch has diverged from the source branch in the same code regions. These must be resolved manually during the cherry-pick before the new PR can be created.

When should I not use cherry-pick for branch synchronization?▼

Avoid cherry-picking when branches have heavily diverged or when many interdependent commits must move together; in those cases a merge or rebase strategy preserves context better than isolated cherry-picks.

Related Skills

Explore More Software Engineering Skills→
NVIDIANVIDIA
3.4k

release-cherry-pick

Cherry-pick labeled merged pull requests into release branches via GitHub CLI.

Official
Advanced
RediSearchRediSearch
6.2k

pr-backport

Cherry-pick merged pull requests into release branches with conflict resolution and validation.

Official
Advanced
spyqsspyqs

update-nanoclaw

Synchronize a customized NanoClaw fork with upstream updates via merge, cherry-pick, or rebase.

Community
Advanced
bikeindexbikeindex
308

merge-conflicts

Guide git merge conflict resolution with merge instead of rebase.

Official
Intermediate