resolving-merge-conflicts git:20260824.da779f9C

Immutable. This exact content never changes and is served at /api/v1/blob/2c79de29533107c0.

---
{
  "name": "resolving-merge-conflicts",
  "description": "Systematically resolve merge conflicts by understanding both sides and finding the correct resolution. Use when a merge conflict needs resolution or you need to understand what both branches intended.",
  "credit": "Matt Peacock (mattpocock/skills)"
}
---

# Resolving Merge Conflicts

Systematically resolve merge conflicts by understanding both sides and finding the correct resolution.

## Process

1. **Read both sides** — What does each branch change?
2. **Understand intent** — Why was each change made?
3. **Find the correct resolution** — Which changes should win?
4. **Apply the resolution** — Make the code correct.
5. **Verify** — Tests pass, behavior is correct.

## Rules

- Understand both sides before resolving.
- The correct resolution preserves both intents when possible.
- Don't just pick one side blindly.
- Test after resolving.

## Credit

This skill is based on the work of **Matt Peacock** ([@mattpocock](https://github.com/mattpocock)). Original source: [mattpocock/skills](https://github.com/mattpocock/skills). Licensed under MIT.