# Resolving Merge Conflicts

> Merge conflict resolution. Use when a merge or a rebase is in progress and has stopped on conflicts.

- Skill: `amornsit/resolving-merge-conflicts` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add amornsit/resolving-merge-conflicts`
- Raw SKILL.md: https://api.skillmd.com/api/skills/amornsit/resolving-merge-conflicts/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: amornsit (https://skillmd.com/u/amornsit)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/amornsit/resolving-merge-conflicts

---


# Resolving Merge Conflicts

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 Matt Pocock's "resolving-merge-conflicts" skill (github.com/mattpocock/skills) — MIT ©
Matt Pocock. Procedure reproduced unchanged; an `# H1` was added for this repo's `MD041` rule and the
description rewritten to front-load its leading word. See [NOTICE.md](../../NOTICE.md).*