Skills
.Work. You
Rest

merge-conflict

Community

Explain and resolve all merge conflicts with clarity.

Software Engineering#automation#git#scripting#conflict-resolution#code-review#merge-conflict
Authorberkcangumusisik
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps developers identify and resolve merge conflict markers across a repository, providing clear explanations of each conflict and suggested resolutions to streamline collaboration.

Core Features & Use Cases

  • Conflict detection: Find all files containing conflict markers (<<<<<, =======, >>>>>>>) and list conflicting blocks.
  • Rationale and resolution: For each block, explain what HEAD and theirs are trying to do and propose resolved code with justification.
  • Automation-ready: After confirmation, apply the proposed resolutions and stage changes for commit.

Quick Start

Review the repo to locate merge conflicts, then provide a resolution for each block and apply after user confirmation.

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: merge-conflict
Download link: https://github.com/berkcangumusisik/claude-code-practices/archive/main.zip#merge-conflict

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 471,000+ vetted skills library on demand.