Resolving Merge Conflicts

Degree of freedom: MIXED. Which intent wins [HIGH freedom]; inspect, never --abort unasked, and run real checks [LOW freedom — run exactly].

Adapted from mattpocock/skills (MIT).

How to reason

1. Identify — operation (merge/rebase/cherry-pick) and conflicted files
2. Intent — why each side changed, from commits/PRs — not the markers
3. Preserve — both intents if possible; else the merge's stated goal
4. Verify — typecheck + tests + lint; then finish the operation

Worked example