How do you resolve merge conflicts effectively?

Inspect conflict blocks, keep intended logic, run tests, then mark resolved files with git add and complete merge or rebase.