From: John Szakmeister <john@szakmeister.net>
Date: Thu, 03 Jan 2013 23:53:34 GMT
Subject: Re: Pretty pictures of git merge conflicts
Message-ID: <CAEBDL5VDX0BBjORX6EyZ7_4dUU7W1L2u-LqWE4RA0ZW6n5cpFw@mail.gmail.com>
In-Reply-To: <50E5B3BE.7080500@alum.mit.edu>

On Thu, Jan 3, 2013 at 11:37 AM, Michael Haggerty <mhagger@alum.mit.edu> 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