From: Thomas Rast <trast@student.ethz.ch>
Date: Mon, 15 Sep 2008 23:47:42 GMT
Subject: Re: [IRC/patches] Failed octopus merge does not clean up
Message-ID: <200809160147.45095.trast@student.ethz.ch>
In-Reply-To: <7v63ox9e20.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:
> Thomas Rast <trast@student.ethz.ch> writes:
[...]
> >   Should not be doing an Octopus.
[...]
> > Shouldn't it either really clean up, or really
> > leave the repo in a conflicted merge state?
[...]
> Your analysis is correct --- this has been the correct/established
> behaviour of Octopus from day one.

Including not cleaning up the half-merged state?  If the answer is
"yes", then so be it, merge-octopus has been on this project longer
than I have ;-)

However,

> Run "git reset --hard" after that, perhaps.

wasn't immediately obvious to the end-user (jammyd in this case),
which started the discussion.

-- 
Thomas Rast
trast@student.ethz.ch