merge-resolver
Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).
- License
- MIT
Pinned to revision 6e62f3d0a901, so it is the text this page describes rather than whatever the author pushed since.
Files
- skills/merge-resolver/SKILL.md
- skills/merge-resolver/references/strategies.md
- skills/merge-resolver/scripts/CLAUDE.md
- skills/merge-resolver/scripts/resolve_pr_conflicts.py
- skills/merge-resolver/scripts/verify_no_conflict_markers.py
Every link opens the file at its source, pinned to the revision this page describes.