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

Re: No one understands diff3 "Temporary merge branch" conflict markers

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jul 7, 2015, 21:44 UTC
Message-ID
<vpqd203lk1l.fsf@anie.imag.fr>
In-Reply-To
<xmqqzj373lrn.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 8 quoted lines
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> ... I would say: the
>> recursive merge-base was computed internally, but not really meant to be
>> shown to the user.
>
> I wonder if the output becomes easier to read if we unconditionally
> turned off diff3-style for inner merges.

Or replace the whole conflict markers with "Sorry, cannot compute a merge base" text when doing the recursive merge to build the merge base.

I don't know that area well enough to have a real opinion.
-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Junio C Hamano
Message 4 of 4 in “No one understands diff3 "Temporary merge branch" conflict markers”
  1. Edward AndersonJul 7, 2015
  2. Matthieu MoyJul 7, 2015
  3. Junio C HamanoJul 7, 2015
  4. Matthieu MoyJul 7, 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.