git-conflict-resolution
CommunityNavigate and resolve Git merge conflicts confidently.
AuthorJimmyTranDev
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Resolve git merge conflicts correctly by understanding both sides, choosing the right strategy, and verifying the result.
Core Features & Use Cases
- Conflict marker anatomy (diff2 and diff3) explanation to identify changes from each branch.
- Resolution decision tree covering import/dependency, function/logic, configuration, and style conflicts.
- Post-resolution verification steps: check conflict markers, build, tests, linter, and diff review.
Quick Start
Identify conflicted files, inspect both sides of each conflict, apply a chosen resolution strategy, and verify the merge before committing.
Dependency Matrix
Required Modules
None requiredComponents
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-conflict-resolution Download link: https://github.com/JimmyTranDev/dotfiles/archive/main.zip#git-conflict-resolution Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.