GitMerge for Unity actually works.
It lets you merge scenes and prefabs.
It is easy to install, feels appropriate to the dialects of both Unity and Git, and has a nice, visual merging interface. And, it’s free and open source.
I will be using this in every project from now on.