Skills
.Work. You
Rest

fix-backport-conflicts

Official

Resolve Git merge conflicts in backports.

Software Engineering#git#developer tools#code review#github actions#merge conflicts#backporting
Authorscylladb
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automates the resolution of inline merge conflict markers that arise during the backporting of code changes, ensuring clean commits with original authorship preserved.

Core Features & Use Cases

  • Conflict Detection: Identifies inline merge conflict markers (<<<<<<<, =======, >>>>>>>) in Git commits.
  • Conflict Resolution: Provides a structured workflow for understanding and manually resolving merge conflicts.
  • Commit Reconstruction: Recreates original commits with correct authorship and messages after conflict resolution.
  • Use Case: When a critical bug fix is backported to an older release branch, and the cherry-pick process introduces merge conflicts, this Skill helps clean up those conflicts and ensure the backported commit is correctly attributed and messages are preserved.

Quick Start

Use the fix-backport-conflicts skill to resolve conflicts in pull request number 13920.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: fix-backport-conflicts
Download link: https://github.com/scylladb/scylla-cluster-tests/archive/main.zip#fix-backport-conflicts

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.