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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 18, 2015, 15:57 UTC
Message-ID
<xmqqsi9pf1q2.fsf@gitster.dls.corp.google.com>
In-Reply-To
<5582B8EC.1060205@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
> This type of request comes up often (for a reason). I'm wondering
> whether we could support it more systematically, either by exposing the
> steps above as a command, or by storing the unresolved merge somewhere
> (leveraging stash or rerere).
Perhaps 'tr/remerge-diff' (on 'pu') is of interest?
Previous: Johannes SchindelinNext: Michael J Gruber
Message 6 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.