Another Git catastrophe cleaned up https://blog.plover.com/prog/git-tastrophe.html (nice demo of custom merge drivers and advanced git-fu)