Resolves git merge conflicts correctness-first, then proves the tree still builds. Use when a merge, rebase, cherry-pick, or stash pop leaves conflict markers or unmerged paths.
