https://github.com/Peaker/git-mediate is an amazing secret weapon for making quick work of 3-way conflict resolution.