# Merge Conflict Resolution

> Use when: resolve git merge or rebase conflicts correctly without losing intended changes.

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

---


Goal: a merged result that keeps both sides' intent and still works.

Use for:
- resolving conflicts during merge, rebase, or cherry-pick
- understanding which changes to keep and why
- recovering from a confusing conflicted state

Workflow:
1. Understand both sides before editing: what each change intended.
2. Open each conflicted file; read the full surrounding context.
3. Combine intents; do not blindly pick one side.
4. Remove all conflict markers and reconcile the logic.
5. Build and run tests before completing the merge.
6. Review the final diff against both parents.

Tactics:
- use a three-way merge tool for complex conflicts
- resolve in small logical chunks
- re-run the feature's tests, not just compile
- when lost, abort and restart with a clearer plan

Rules:
- never keep conflict markers in committed code
- do not discard a side without understanding it
- verify behavior after resolving, not just syntax
- prefer git merge --abort over guessing when unsure