I recently learned about the -X option for git merge, which allows you to specify options for the merge strategy. I was trying to merge a branch which had changes in whitespace throughout several files. With just the default options, git did a pretty bad job and there were a lot of large conflicts with no obvious difference besides whitespace. But then a coworker told me about "-X ignore-space-change". With that option, there was only a single small conflict, which was easy to resolve.