All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Markus Elfring <Markus.Elfring@web.de>
Cc: git@vger.kernel.org
Subject: Re: Challenges for an octopus merge
Date: Fri, 11 Feb 2011 10:22:21 -0800	[thread overview]
Message-ID: <7vd3my1leq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4D55627F.30305@web.de> (Markus Elfring's message of "Fri\, 11 Feb 2011 17\:23\:27 +0100")

Markus Elfring <Markus.Elfring@web.de> writes:

>> The second-to-last line of the output needs to be rephrased.
>
> Which wording adjustment have you got in mind?

Something along the two lines below to rephase the second-to-last line of
the output I quoted from your original message.

>> Octopus is not for recording conflicting merges and when it punts you
>> shouldn't be attempting to resolve and record it as an octopus merge.

> Would it make sense to specify that the merging process may switch to the
> strategy "resolve" on demand?

Depends on what you mean by "on demand", but if you mean "git merge A B C"
automagically turns into "git merge A; git merge B; git merge C" then I
don't think that makes much sense.  The user needs to decide what to do
next; the user may choose to do "git merge A C ; git merge B" instead, but
*after* inspecting the situation.

  reply	other threads:[~2011-02-11 18:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-10 14:30 Challenges for an octopus merge Markus Elfring
2011-02-10 16:09 ` Junio C Hamano
2011-02-11 16:23   ` Markus Elfring
2011-02-11 18:22     ` Junio C Hamano [this message]
2011-02-12  4:50       ` Markus Elfring
2011-02-15 17:29       ` Markus Elfring
2011-04-08 15:27 ` Markus Elfring

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

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

  git send-email \
    --in-reply-to=7vd3my1leq.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Markus.Elfring@web.de \
    --cc=git@vger.kernel.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.