mp-resolve-merge-conflicts

---
name: mp-resolve-merge-conflicts
description: "Use when resolving an in-progress git merge or rebase conflict — understand each side's intent from primary sources, preserve both where possible, then finish the merge."
source: https://github.com/mattpocock/skills/blob/main/skills/engineering/resolving-merge-conflicts/SKILL.md
generated: 2026-07-08T18:58:08.450Z
category: concept
audience: engineers
---

## When to use

- A git merge or rebase is in progress with conflicts to resolve
- You need to reconcile two changes without losing either intent
- You want conflicts resolved from original intent, not guesswork
- You need the merge finished and verified, not aborted

## Key concepts

### See the current state

Start by inspecting the merge/rebase state — git history and the conflicting files — before touching anything.

### Find the primary sources

For each conflict, understand deeply why each change was made: read commit messages, check the PRs, and check the original issues/tickets. Resolve from intent, not from the text alone.

### Preserve both intents

Resolve each hunk preserving both intents where possible; where incompatible, pick the one matching the merge's stated goal and note the trade-off. Never invent new behaviour.

### Run the project's checks

Discover the project's automated checks — typically typecheck, then tests, then format — and run them, fixing anything the merge broke.

### Always finish the merge

Stage everything and commit; if rebasing, continue until all commits are rebased. Always resolve — never `--abort`.

## Gotchas

- Never `git --abort` — always resolve the conflict through
- Don't invent new behaviour while resolving; preserve existing intents
- When intents are incompatible, follow the merge's stated goal and record the trade-off
- Run the project's checks after resolving and fix what the merge broke before committing

---
Generated by SkillMake from https://github.com/mattpocock/skills/blob/main/skills/engineering/resolving-merge-conflicts/SKILL.md on 2026-07-08T18:58:08.450Z.
Verify against source before relying on details.

File: ~/.claude/skills/mp-resolve-merge-conflicts/SKILL.md