merge-conflict-tool
CommunityAutomate conflict resolution with precision, preserve all sides' work.
Authordawsonl1
Version1.0.0
Installs0
System Documentation
What problem does it solve?
This Skill resolves git merge, rebase, or cherry-pick conflicts by preserving both sides' work and using a structured approach to conflict resolution, eliminating the need for manual intervention and reducing merge-related errors.
Core Features & Use Cases
- Conflict Detection and Clustering: Automatically identifies and clusters related conflicts based on file relationships and shared commit history.
- Paired Defender Subagents: Independently analyzes both sides of each conflict cluster to preserve intent and avoid bias.
- Synthesized Resolution: Categorizes conflicts as overlap, complement, or genuine conflict and synthesizes a resolution that preserves both sides' contributions.
- Verification and Testing: Provides verification through targeted tests, frontend build, and visual verification for UI changes, ensuring accuracy before continuing the merge.
Quick Start
Activate the merge-conflict-tool skill when you encounter a git merge conflict and let it handle the resolution.
Dependency Matrix
Required Modules
gitpython
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-tool Download link: https://github.com/dawsonl1/merge-conflict-tool/archive/main.zip#merge-conflict-tool 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 620,000+ vetted skills library on demand.