From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 16:09:00 GMT
Subject: Re: Challenges for an octopus merge
Message-ID: <7v8vxn6fdv.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D53F694.1060105@web.de>

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

> ...
> Automated merge did not work.
> Should not be doing an Octopus.
> Merge with strategy octopus failed.
>
>
> The merge description was missing (no commit message) in this case.

The second-to-last line of the output needs to be rephrased.

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.