Merge Conflict Walkthrough
Walks through each conflicted file in a merge or rebase — reads both sides, proposes a resolution, explains the rationale.
Entry verified April 21, 2026
The short answer
Merge conflicts are where solo developers lose the most time. This skill lists the conflicted files, opens each one, proposes a resolution that preserves both intents where possible, and explains which “side” each chunk came from.
When to use it
Any merge or rebase with 3+ conflicted files, or a single file with non-obvious conflicts (renames, formatting clashes, import reorders).
Setup
- 1
Save as ~/.claude/commands/merge-conflict.md. Skill runs git diff --name-only --diff-filter=U to list conflicts.
- 2
For each file, reads the <<<<<<< / >>>>>>> markers and proposes a merged version with a note on what each side contributed.
- 3
Never auto-resolves — always shows the proposal for human approval.
Example
You: /merge-conflict
Claude: [lists 4 conflicted files]
1. pages/sitemap.js — both sides added entries, merge is additive. Proposed resolution inline.
2. package.json — version bump conflict. Keep HEAD (newer).
3. README.md — rename + edit, manual review needed.
4. .env.example — your side added ANTHROPIC_API_KEY, their side added OPENAI_KEY. Keep both.Source & attribution
- Author
- Bryan Collins
- Licence
- MIT (author's own work)
- Type
- Original
Original pattern published under MIT — attribution preserved by convention, not licence requirement.
Caveats
Complex renames + refactors may still need human judgment — the skill explains its reasoning but shouldn’t be trusted blindly.
56 skills across 10 categories, all licence-verified.