Installs into .claude/skills of the current project.
Are you the author of Resolve Merge Conflicts?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/everywan-dev-resolve-merge-conflicts)
---
name: resolve-merge-conflicts
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
---
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
---
*Adapted from [`mattpocock/skills`](https://github.com/mattpocock/skills), MIT licence, Copyright (c) 2026 Matt Pocock. Renamed and cross-linked for this collection; the method is his. Full licence text in [`LICENSES/mattpocock-skills-MIT.txt`](../../LICENSES/mattpocock-skills-MIT.txt).*
