Skills
.Work. You
Rest

cmd-pr-conflict-resolver

Community

Systematically resolve merge conflicts.

Software Engineering#git#developer tools#collaboration#version control#merge conflicts#code resolution
AuthorOlshansk
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides a structured, systematic approach to resolving merge conflicts in code, ensuring that resolutions are context-aware, well-reasoned, and safely integrated.

Core Features & Use Cases

  • Systematic Conflict Mapping: Identifies and inventories all merge conflicts.
  • Contextual Analysis: Gathers context by examining file history, surrounding code, and business logic impact for each conflict.
  • 3-Tier Classification: Categorizes conflicts into Auto-resolve, Resolve with Rationale, or Escalate tiers.
  • Guided Resolution: Provides specific strategies for resolving different types of conflicts (e.g., lists, function bodies, configs).
  • Safe Verification & Staging: Ensures all conflicts are resolved without markers and staged appropriately.
  • Use Case: When faced with a complex merge involving multiple developers and overlapping changes, this Skill guides you through each conflict, ensuring no critical logic is lost or incorrectly applied.

Quick Start

Use the cmd-pr-conflict-resolver skill to systematically resolve all merge conflicts in the current branch.

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: cmd-pr-conflict-resolver
Download link: https://github.com/Olshansk/agent-skills/archive/main.zip#cmd-pr-conflict-resolver

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.