From: Markus Elfring <markus.elfring@web.de>
Date: Fri, 11 Feb 2011 16:23:27 GMT
Subject: Re: Challenges for an octopus merge
Message-ID: <4D55627F.30305@web.de>
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