merge-conflict-resolver
CommunityPre-empt merge conflicts with guided analysis.
Authorauldsyababua
Version1.0.0
Installs0
System Documentation
What problem does it solve?
A comprehensive skill for analyzing Git branch divergence, detecting potential merge conflicts before they occur, and guiding users through systematic conflict resolution. This skill provides both automated analysis and manual resolution workflows.
Core Features & Use Cases
- Intelligent auto-detection of current branch and target branch, with auto-discovery of repository root.
- 8-step analysis workflow that surfaces conflicts before attempting a merge.
- Color-coded terminal output for quick scanning and decision making.
- Multiple resolution strategies: automated orchestrator, detailed analysis, simple merge helper, and status checks.
- Works in any Git repository without hardcoded paths.
Quick Start
- cd /path/to/your/repository
- Run the orchestrator: ./skills/merge-conflict-resolver/scripts/resolve-merge-conflicts.sh
- Or specify branches: ./skills/merge-conflict-resolver/scripts/resolve-merge-conflicts.sh feature/my-feature origin/main
Dependency Matrix
Required Modules
None requiredComponents
scripts
💻 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/auldsyababua/instructor-workflow/archive/main.zip#merge-conflict-resolver 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.