git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Pretty pictures of git merge conflicts

From
John Szakmeister <john@szakmeister.net>
Date
Jan 3, 2013, 23:53 UTC
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:
Show 12 quoted lines
> 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
Previous: Michael Haggerty
Message 2 of 2 in “Pretty pictures of git merge conflicts”
  1. Michael HaggertyJan 3, 2013
  2. John SzakmeisterJan 3, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.