resolving-merge-conflicts
Medium Risk 69Resolve Git Merge Conflicts Safely
by mattpocock
Merge and rebase conflicts often hide competing design intentions. This skill guides Claude, Codex, and Claude Code through research, resolution, validation, and completion.