Skills
.Work. You
Rest

merge-conflicts

Community

Resolve Git merge conflicts quickly and cleanly.

Software Engineering#git#branching#rebase#conflict-resolution#version-control#merge-conflicts#code-merges
Authorlucasilverentand
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Git merge conflicts are a common source of integration headaches, causing stalled work and potential errors if not resolved cleanly.

Core Features & Use Cases

  • Detect and identify conflicting files during merges or rebases.
  • Present clear conflict markers and versions (ours vs theirs) to aid decision making.
  • Provide step-by-step resolution strategies and best practices.
  • Verify the resolution by testing and re-running the merge or rebase.

Quick Start

Example: merge-conflicts path/to/conflicted-file

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-conflicts
Download link: https://github.com/lucasilverentand/skills/archive/main.zip#merge-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.