{"thread":{"id":"32517","subject":"Pretty pictures of git merge conflicts","startedAt":"2013-01-03T16:37:18Z","lastAt":"2013-01-03T23:53:34Z","messageCount":2,"participants":["Michael Haggerty","John Szakmeister"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"205938","messageId":"50E5B3BE.7080500@alum.mit.edu","threadId":"32517","inReplyTo":null,"subject":"Pretty pictures of git merge conflicts","fromName":"Michael Haggerty","fromEmail":"mhagger@alum.mit.edu","sentAt":"2013-01-03T16:37:18Z","receivedAt":"2013-01-03T16:37:18Z","isPatch":false,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"Hi,\n\nI've been thinking lately about how to attack difficult git merge\nconflicts.  The first step is to visualize them.  I have written some\narticles [1,2,3] describing a way to atomize a complicated merge and\nefficiently compute diagrams that show which pairwise commits cause the\nmerge to go awry.  I hope you find them interesting; feedback would be\nvery welcome.\n\nI am working on some more articles (including software) that I plan to\ngrow into tools to help users perform git merges that would otherwise\nseem hopeless.\n\nMichael\n\n[1]\nhttp://softwareswirl.blogspot.de/2012/12/the-conflict-frontier-of-nightmare-merge.html\n[2]\nhttp://softwareswirl.blogspot.de/2012/12/mapping-merge-conflict-frontier.html\n[3]\nhttp://softwareswirl.blogspot.de/2012/12/real-world-conflict-diagrams.html\n\n-- \nMichael Haggerty\nmhagger@alum.mit.edu\nhttp://softwareswirl.blogspot.com/\n"},{"id":"205962","messageId":"CAEBDL5VDX0BBjORX6EyZ7_4dUU7W1L2u-LqWE4RA0ZW6n5cpFw@mail.gmail.com","threadId":"32517","inReplyTo":"50E5B3BE.7080500@alum.mit.edu","subject":"Re: Pretty pictures of git merge conflicts","fromName":"John Szakmeister","fromEmail":"john@szakmeister.net","sentAt":"2013-01-03T23:53:34Z","receivedAt":"2013-01-03T23:53:34Z","isPatch":false,"sender":{"key":"john@szakmeister.net","avatar":"https://avatars.githubusercontent.com/u/448087?v=4"},"body":"On Thu, Jan 3, 2013 at 11:37 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:\n> Hi,\n>\n> I've been thinking lately about how to attack difficult git merge\n> conflicts.  The first step is to visualize them.  I have written some\n> articles [1,2,3] describing a way to atomize a complicated merge and\n> efficiently compute diagrams that show which pairwise commits cause the\n> merge to go awry.  I hope you find them interesting; feedback would be\n> very welcome.\n>\n> I am working on some more articles (including software) that I plan to\n> grow into tools to help users perform git merges that would otherwise\n> seem hopeless.\n\nInteresting work Michael!  Interestingly, I've taken such an approach\nin a few real life situations.  It was a real help it trying to get\nthe conflicts resolved, so I'm eager to see the tools you come up\nwith!\n\n-John\n"}]}