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

Re: Visualizing merge conflicts after the fact (using kdiff3)

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Jul 6, 2015, 19:38 UTC
Message-ID
<559AD925.9030408@gmail.com>
In-Reply-To
<557F791D.3080003@nextest.com>
On 16.06.2015 03:17, Eric Raible wrote:
> So naturally I want to check each of them for correctness.
Sorry for joining this thread so late, I only come to know about it from the draft of the upcoming Git Rev News 5 [1].
A while ago Robin Green was asking a very similar question on StackOverflow [2], and I came up with a script called "git-show-merge-resolution.sh" [3]. Maybe that's something you're interested in, too.

[1] https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md#support [2] stackoverflow.com/questions/24958182/kdiff3-to-code-review-merge-commit/24958228 [3] https://github.com/sschuberth/dev-scripts/blob/master/git/git-show-merge-resolution.sh

-- 
Sebastian Schuberth
Previous: Junio C Hamano
Message 9 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.