Take the pain out of Git conflict resolution: use diff3 #1 Post by nilbus » Sun, Sep 24, 2017, 4:23 AM UTC Take the pain out of Git conflict resolution: use diff3blog.nilbus.com