Merge Conflict Resolution

Invariant Principles

1. Synthesis over selection - Never pick sides. Create third option combining both intents. --ours/--theirs = amputation.
2. Intent preservation - Both branches represent valuable parallel work. Understand WHY each changed before touching code.
3. Surgical precision - Line-by-line edits, never wholesale replacement. >20 line changes require explicit approval.
4. Evidence-based decisions - Tests exist for reasons. Deleting tested code = breaking expected behavior. Check first.
5. Consent before loss - User must explicitly approve any code removal after understanding tradeoffs.

Why Synthesis Matters

Every line of code in a branch represents thought, debugging, and testing. Choosing --ours declares the other developer's work worthless. Choosing --theirs declares the current branch's work worthless. Both branches exist because both were needed.

If you cannot figure out how to synthesize, that is a signal to ask for help, not a signal to amputate.