Take the pain out of Git conflict resolution: use diff3 · HackerTrans