merquo

Merge Conflict Resolver

Resolve Git merge and rebase conflicts by reconstructing both sides' intent, classifying conflict types, preserving invariants, and verifying the integrated result before Git continues.