Skills
.Work. You
Rest

merge-conflict-resolver

Community

Resolve Git conflicts with ease.

Software Engineering#git#version control#merge conflict#rebase#cherry-pick#code resolution
AuthorMoliboy5000
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps users navigate and resolve complex Git merge, rebase, and cherry-pick conflicts, preventing data loss and project stalls.

Core Features & Use Cases

  • Interactive Conflict Analysis: Understands "ours" vs. "theirs" for each conflict hunk.
  • Intelligent Recommendations: Suggests the best resolution strategy (keep ours, keep theirs, combine, rewrite) with clear reasoning.
  • Guided Resolution: Assists in applying the chosen resolution and staging the files.
  • Use Case: When a git merge command fails due to conflicting changes in multiple files, this Skill can analyze each conflict, propose solutions, and guide the user through the process of cleaning up the repository.

Quick Start

Help me resolve the merge conflicts in my current branch.

Dependency Matrix

Required Modules

None required

Components

scriptsreferences

💻 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-resolver
Download link: https://github.com/Moliboy5000/.claude/archive/main.zip#merge-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.