From: Markus Elfring <Markus.Elfring@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Challenges for an octopus merge
Date: Fri, 11 Feb 2011 17:23:27 +0100 [thread overview]
Message-ID: <4D55627F.30305@web.de> (raw)
In-Reply-To: <7v8vxn6fdv.fsf@alter.siamese.dyndns.org>
> The second-to-last line of the output needs to be rephrased.
Which wording adjustment have you got in mind?
> 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?
Regards,
Markus
next prev parent reply other threads:[~2011-02-11 16:24 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 [this message]
2011-02-11 18:22 ` Junio C Hamano
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=4D55627F.30305@web.de \
--to=markus.elfring@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).