cherry-pick-backport

Backport upstream commits into downstream release branches with cherry-pick and conflict resolution.

Updated Mar 11, 2026
One-click install
npx skills add https://github.com/aslakknutsen/ossm-cherry-pick-backport-skill --skill cherry-pick-backport
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: cherry-pick-backport
Source: https://github.com/aslakknutsen/ossm-cherry-pick-backport-skill/tree/main
Command: npx skills add https://github.com/aslakknutsen/ossm-cherry-pick-backport-skill --skill cherry-pick-backport

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

This Skill automates the complex and time-consuming process of backporting commits from an upstream repository into older, downstream release branches, including AI-assisted conflict resolution and code adaptation.

Core Features & Use Cases

  • Automated Backporting: Cherry-picks specified commits into target branches.
  • AI-Assisted Conflict Resolution: Intelligently resolves merge conflicts.
  • Code Adaptation: Adjusts code for older Go versions, dependency differences, and API changes.
  • Automated Review: Compares backported code against the original to flag divergences.
  • Use Case: When a critical bug fix is made in the main istio/istio repository, this Skill can automatically backport that fix to multiple older openshift-service-mesh/istio release branches (e.g., release-2.4, release-2.3), ensuring stability across supported versions.

Quick Start

Backport commit abc123def into release-2.4.

Frequently Asked Questions about cherry-pick-backport

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

FAQPage Schema
How do I backport commits to older release branches?

AI-assisted cherry-pick backporting resolves merge conflicts by dispatching sub-agents to intelligently adapt code for older API versions and dependencies. It automates conflict resolution during the integration of upstream commits into downstream release branches.

Can I automatically adapt code for older Go versions during a cherry-pick?

Code adaptation for older Go versions during a cherry-pick is supported by dispatching sub-agents that adjust for dependency differences and API changes. This ensures the backported commit integrates cleanly with the older branch's environment.

Does backporting handle detection of upstream and downstream git remotes?

Yes, backporting handles detection of upstream and downstream git remotes automatically. It identifies the remote repositories to determine where to pull the original commit from and where to apply the cherry-picked changes.

What is the best way to verify backported code against the original commit?

The best way to verify backported code against the original commit is using the automated review phase, which compares the backported changes against the original and flags unjustified divergences. This ensures the backport maintains the original intent.

Can I push branches and create pull requests after backporting?

Yes, you can optionally push branches and create pull requests after backporting. The Skill supports automated pushing of the isolated worktree branches and subsequent pull request creation to finalize the release management workflow.