Subject: Re: [IRC/patches] Failed octopus merge does not clean up

From: Thomas Rast <[email-masked]>
Date: Tue, 16 Sep 2008 01:47:42 +0200

Junio C Hamano wrote:
> Thomas Rast <[email-masked]> 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
[email-masked]