merge-conflict-resolver

Analyze branch divergence, detect potential conflicts, and guide merge resolution for any Git repository. Auto-detects current branch or accepts parameters.

$ Installieren

git clone https://github.com/majiayu000/claude-skill-registry /tmp/claude-skill-registry && cp -r /tmp/claude-skill-registry/skills/design/merge-conflict-resolver ~/.claude/skills/claude-skill-registry

// tip: Run this command in your terminal to install the skill