fix-merge-conflicts

Resolve git merge conflicts in dependency files, source code, and configuration. Use when merge conflicts are detected.

$ Instalar

git clone https://github.com/majiayu000/claude-skill-registry /tmp/claude-skill-registry && cp -r /tmp/claude-skill-registry/skills/development/fix-merge-conflicts ~/.claude/skills/claude-skill-registry

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