Subject: Re: Challenges for an octopus merge

From: Markus Elfring <[email-masked]>
Date: Fri, 11 Feb 2011 17:23:27 +0100

> 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