skills/merge-conflicts/SKILL.md

---
name: merge-conflicts
description: Resolve merge or rebase conflicts by tracing intent and preserving both sides where appropriate.
---

# Merge Conflicts

Inspect each hunk, understand the intent of both changes from their primary sources, resolve by behavior rather than proximity, run focused tests, inspect the final diff, and complete the merge or rebase only when the result is coherent. Never discard a side blindly.