Does it automatically create the GitHub PR?

Yes, once conflicts are resolved and the process is continued, the underlying backport tool handles the push and PR creation automatically.

What CLI tool does this skill use?

It integrates directly with the CockroachDB backport CLI tool to automate branch management and PR creation.

When should I use this skill instead of standard Git?

Use this skill when working within the CockroachDB repository to ensure backports follow project-specific conventions, justifications, and automated PR linking.

How does it handle merge conflicts?

The skill analyzes conflicting code blocks, explains the logic differences between branches, and proposes resolutions or seeks developer guidance for complex logic changes.

Can I target specific release branches?

Yes, you can specify target releases like '23.2' or specific release candidate branches using the -r or -b flags through the assistant.

Backport PR Assistant

Name: Backport PR Assistant
Author: cockroachdb

bycockroachdb

•

31,703

•

開発者ツール

Automates backporting pull requests to release branches and provides expert assistance for resolving complex merge conflicts.

The Backport PR Assistant streamlines the process of porting code changes from main branches to older release versions using the specialized backport CLI tool. It guides developers through complex cherry-picking scenarios, manages release justifications, and provides step-by-step resolution paths when merge conflicts arise. By analyzing branch differences and proposing logic-aware fixes, it ensures stable and consistent updates across all supported database versions without the manual overhead of traditional git cherry-picking.

主な機能

01Support for specific release and release-candidate branches

02Resumable workflow handling for multi-file conflict scenarios

03Release justification management for audit trails

0431,703 GitHub stars

05Intelligent merge conflict analysis and resolution proposals

06Automated backporting via specialized CLI integration

ユースケース

01Applying critical bug fixes to older production releases

02Porting security patches across multiple maintenance branches simultaneously

03Resolving non-trivial merge conflicts caused by API drift between versions

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add cockroachdb/cockroach backport-pr-assistant

For use in Claude.ai and ChatGPT

Download Skill