On Thu, Jan 3, 2013 at 11:37 AM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote: > 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. Interesting work Michael! Interestingly, I've taken such an approach in a few real life situations. It was a real help it trying to get the conflicts resolved, so I'm eager to see the tools you come up with! -John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html