git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Edward Anderson <nilbus@nilbus.com>, git@vger.kernel.org
Subject: Re: No one understands diff3 "Temporary merge branch" conflict markers
Date: Tue, 07 Jul 2015 23:44:38 +0200	[thread overview]
Message-ID: <vpqd203lk1l.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqzj373lrn.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 07 Jul 2015 10:44:44 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> 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/

      reply	other threads:[~2015-07-07 21:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07 14:55 No one understands diff3 "Temporary merge branch" conflict markers Edward Anderson
2015-07-07 16:16 ` Matthieu Moy
2015-07-07 17:44   ` Junio C Hamano
2015-07-07 21:44     ` Matthieu Moy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpqd203lk1l.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nilbus@nilbus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).