Use when you need to resolve an in-progress git merge/rebase conflict.
Install with the open skills CLI (global, non-interactive — available in every Claude Code session):
npx skills add mattpocock/skills --skill "resolving-merge-conflicts" -g -a claude-code -yOr manually — clone and copy the skill directory (SKILL.md + companion files):
git clone --depth 1 https://github.com/mattpocock/skills /tmp/skills && cp -r /tmp/skills/skills/engineering/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts-mattpocockThis skill is a directory: SKILL.md is the entry point; the files below ship with it.
---
name: resolving-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.
Use when completing tasks, implementing major features, or before merging to verify work meets requirements
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback
Clone/create/fork repos; manage remotes, releases.