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

Pretty pictures of git merge conflicts

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Jan 3, 2013, 16:37 UTC
Message-ID
<50E5B3BE.7080500@alum.mit.edu>
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/
Next: John Szakmeister
Message 1 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.