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

Visualizing merge conflicts after the fact (using kdiff3)

From
EREric Raible <raible@nextest.com>
Date
Jun 16, 2015, 01:17 UTC
Message-ID
<557F791D.3080003@nextest.com>
I'm running 1.9.5.msysgit.1, but this is a general git question...

Upon returning from a vacation, I was looking at what people had been up to, and discovered on merge in which a colleague had resolved a merge incorrectly. It turns out that he has pushed *many* merges over the past year which had conflicts in my code, and now I don't trust any of them.

So naturally I want to check each of them for correctness.

I know about "git log -p -cc SHA -- path", but it really doesn't show just the conflicts so there's just too much noise in that output.

I use kdiff3 to resolve conflicts, so I'm looking for a way to visualize these already-resolved conflicts with that tool. As I said, there are many merges, so the prospect of checking out each sha, doing the merge, and then comparing the results is completely untenable.

Can anyone help? Surely other people have wanted to review how conflicts were resolved w/out looking at the noise of unconflicted changes, right?

Thanks - Eric (raible at gmail )
Next: Johannes Schindelin
Message 1 of 9 in “Visualizing merge conflicts after the fact (using kdiff3)”
  1. Eric RaibleJun 16, 2015
  2. Johannes SchindelinJun 16, 2015
  3. Eric RaibleJun 16, 2015
  4. Michael J GruberJun 18, 2015
  5. Johannes SchindelinJun 18, 2015
  6. Junio C HamanoJun 18, 2015
  7. Michael J GruberJun 19, 2015
  8. Junio C HamanoJun 19, 2015
  9. Sebastian SchuberthJul 6, 2015

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.