Skills
.Work. You
Rest

Git Conflicts

Community

Resolve Git conflicts with confidence.

Software Engineering#git#developer tools#version control#merge#rebase#conflicts
Authordtsong
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill provides guided assistance for resolving merge, rebase, and cherry-pick conflicts in Git, making a complex and often frustrating process more manageable.

Core Features & Use Cases

  • Conflict Detection: Automatically identifies the type of Git operation in progress (merge, rebase, cherry-pick) and lists all conflicting files.
  • Conflict Analysis: For each conflicting file, it analyzes the changes from both branches, explains the differences, and suggests resolution strategies.
  • Guided Resolution: Offers step-by-step instructions and commands for resolving conflicts, including strategies like accepting ours, accepting theirs, or manual merging.
  • Use Case: When a git merge command results in conflicts, you can invoke this Skill to get a clear breakdown of what changed in each file and how to best combine the divergent code.

Quick Start

Run /git-conflicts to get help resolving your current merge conflicts.

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: Git Conflicts
Download link: https://github.com/dtsong/claude-code-windows-setup/archive/main.zip#git-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.