Gitship
Resolve merge conflicts
❯
resolve the merge conflicts in this branch and explain what you kept from each side
Why this works
Say what state you want, not which markers to keep. Asking for the reasoning makes the merge reviewable instead of a black box.