From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Sep 2008 23:36:55 GMT
Subject: Re: [IRC/patches] Failed octopus merge does not clean up
Message-ID: <7v63ox9e20.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200809160048.31443.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> The merge says
>
>   Trying simple merge with 5b3e4bb1c2d88d6967fb575729fbfc86df5eaec9
>   Simple merge did not work, trying automatic merge.
>   Auto-merging foo
>   ERROR: Merge conflict in foo
>   fatal: merge program failed
>   Automated merge did not work.
>   Should not be doing an Octopus.
>   Merge with strategy octopus failed.
>
> So far so good.  However, 'git status' claims
> ...  This behaviour is
> identical for 1.5.6 and 1.6.0.2, so it is not caused by the merge
> rewrite as a builtin.  Shouldn't it either really clean up, or really
> leave the repo in a conflicted merge state?  (I'm following up with a
> patch that turns the above into a test.  Octopus doesn't really have
> many tests, does it?)

Your analysis is correct --- this has been the correct/established
behaviour of Octopus from day one.

Read the second from the last line of what you were told by git.  Run "git
reset --hard" after that, perhaps.