Stats
Actions
Tags
From dmv
Resolves git merge conflicts by analyzing intent from both sides. Use when merge conflicts are detected or when git operations fail with conflict errors.
How this skill is triggered — by the user, by Claude, or both
Slash command
/dmv:merge-conflictsThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
1. **Detect conflicted files:** `git status` — look for "both modified" / "both added"
Detect conflicted files: git status — look for "both modified" / "both added"
For each conflicted file:
Read and understand intent:
git log -p --follow -- path/to/file to see recent historygit blame path/to/file to understand why each side made changesClassify and resolve:
Compatible changes (different additions, merged imports) → auto-resolve, keep both
import { A, B } vs import { A, C } → import { A, B, C }Overlapping changes (same logic modified differently) → combine if possible, explain reasoning
Incompatible changes (mutually exclusive) → do NOT auto-resolve
Apply resolution:
git add path/to/fileReport per file:
File: path/to/file
Strategy: Compatible / Overlapping / Incompatible
Reasoning:
- HEAD: <what it was trying to do>
- Incoming: <what it was trying to do>
- Resolution: <how both intents were preserved>
Confidence: High / Medium / Low
Status: Auto-resolved / Needs review
Provide next steps:
git commit or git merge --continuegit merge --abort or git rebase --abortnpx claudepluginhub racurry/neat-little-package --plugin dmvGuides through git merge conflicts one by one, parsing conflict markers, explaining why each conflict occurred via git history, and presenting resolution options with reasoning.
Resolves in-progress git merge or rebase conflicts by understanding intent, preserving both sides where possible, and running automated checks.
Resolves Git merge and rebase conflicts file-by-file using modern tooling. Activates for conflicted merges, rebases, PRs unable to merge, or diverged branches. Supports --ours, --theirs, auto-push.