skills.rest
cockroachdb
cockroachdbOFFICIAL
Explore all skills by this author →
WebsiteGitHub

backport-pr-assistant

Automate pull request backports to release branches using the backport CLI.

32.4k|4.1k|Updated Feb 6, 2014
Search Tags:#git#release management#pull request#cli#conflict resolution#backport
One-click install
npx skills add https://github.com/cockroachdb/cockroach --skill backport-pr-assistant
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: backport-pr-assistant
Source: https://github.com/cockroachdb/cockroach/tree/main/.claude/skills/backport-pr-assistant
Command: npx skills add https://github.com/cockroachdb/cockroach --skill backport-pr-assistant

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill automates the process of backporting pull requests to older release branches, especially when merge conflicts arise, streamlining the release management workflow.

Core Features & Use Cases

  • Automated Backporting: Uses the backport CLI tool to apply PR changes to specified release branches.
  • Conflict Resolution Assistance: Guides users through resolving merge conflicts during the backporting process.
  • Release Branch Management: Helps maintain consistency across different supported versions of the software.
  • Use Case: A critical bug fix needs to be applied to the release-23.2 and release-23.1 branches. This Skill can automate the backporting of the fix to both branches, handling any necessary conflict resolutions.

Quick Start

Use the backport-pr-assistant skill to backport pull request 12345 to the release-23.2 branch with the justification "bug fix".

Frequently Asked Questions about backport-pr-assistant

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

FAQPage Schema
Do I need to provide a justification when backporting a pull request?▼

Yes, providing a justification is required when backporting a pull request. The Skill incorporates this reasoning into the backport operation to document why the PR changes are being applied to the specified release branch.

How do I backport a pull request to an older release branch?▼

To backport a pull request, this Skill uses the backport CLI tool to automatically apply PR changes to specified release branches. You simply provide the PR number, target branch, and a justification for the backport operation.

What happens when a git backport encounters merge conflicts?▼

When a backport encounters merge conflicts, the Skill pauses and guides users through the conflict resolution steps. After you manually resolve the conflicts, the process resumes to complete the pull request backporting.

Can I backport a bug fix to multiple release branches at the same time?▼

Yes, you can backport a bug fix to multiple release branches. The Skill supports targeting specific branches or releases, allowing you to apply necessary changes across different supported versions simultaneously.

What is the best way to automate release management backports for critical fixes?▼

Automating release management backports is best handled by using the backport CLI tool through this Skill. It streamlines applying critical fixes to older branches and includes conflict resolution assistance to maintain version consistency.

Do I need to provide a justification when backporting a pull request?▼

Yes, providing a justification is required when backporting a pull request. The Skill incorporates this reasoning into the backport operation to document why the PR changes are being applied to the specified release branch.

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
nsheapsnsheaps
3

update-branch

Synchronize feature branches with their PR base using git and gh.

Community
Advanced
edlngedlng
2

finishing-a-development-branch

Automate development branch integration and cleanup after verifying test status.

Community
Advanced
aslakknutsenaslakknutsen

cherry-pick-backport

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

Community
Advanced