Painless merge conflicts in Git

Resolving merge conflicts in Git can be a pain - I always find I need to see the common ancestor to understand what’s going on with the two conflicting versions.

This excellent blog post explains how to enable 3-way diff and why it matters. The short version:

$ git config --global merge.conflictstyle diff3

Do you have any helpful git tips? Leave a comment below.