Pretty pictures of git merge conflicts

Pretty pictures of git merge conflicts

[Michael Haggerty]

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/

Re: Pretty pictures of git merge conflicts

[John Szakmeister]

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