Skills
.Work. You
Rest

roo-conflict-resolution

Official

Resolve Git conflicts intelligently.

Software Engineering#git#code review#collaboration#pull request#merge conflicts#rebase
Authorzgsm-ai
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill automates the complex and time-consuming process of resolving Git merge conflicts, ensuring code integrity and efficient collaboration.

Core Features & Use Cases

  • Intelligent Conflict Analysis: Analyzes commit messages, git blame, and code intent to make informed resolution decisions.
  • Automated Resolution Workflow: Handles merge conflicts for pull requests, rebasing, and PR conflicts.
  • Use Case: When a pull request has conflicts with the main branch, this skill can automatically analyze the conflicting changes, understand the intent behind each, and propose or apply a resolution that preserves valuable code from both sides.

Quick Start

Use the roo-conflict-resolution skill to resolve merge conflicts for pull request number 456.

Dependency Matrix

Required Modules

None required

Components

references

💻 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: roo-conflict-resolution
Download link: https://github.com/zgsm-ai/costrict/archive/main.zip#roo-conflict-resolution

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.