From: Michael Haggerty Date: Thu, 03 Jan 2013 16:37:18 GMT Subject: Pretty pictures of git merge conflicts Message-ID: <50E5B3BE.7080500@alum.mit.edu> Hi, I've been thinking lately about how to attack difficult git merge conflicts. The first step is to visualize them. I have written some articles [1,2,3] describing a way to atomize a complicated merge and efficiently compute diagrams that show which pairwise commits cause the merge to go awry. I hope you find them interesting; feedback would be very welcome. I am working on some more articles (including software) that I plan to grow into tools to help users perform git merges that would otherwise seem hopeless. Michael [1] http://softwareswirl.blogspot.de/2012/12/the-conflict-frontier-of-nightmare-merge.html [2] http://softwareswirl.blogspot.de/2012/12/mapping-merge-conflict-frontier.html [3] http://softwareswirl.blogspot.de/2012/12/real-world-conflict-diagrams.html -- Michael Haggerty mhagger@alum.mit.edu http://softwareswirl.blogspot.com/