From: Thomas Rast <trast@student.ethz.ch>
Date: Thu, 26 Nov 2009 16:44:52 GMT
Subject: Re: Octopus merge
Message-ID: <200911261744.56913.trast@student.ethz.ch>
In-Reply-To: <4B0EA512.1050001@loria.fr>

Claudia.Ignat@loria.fr wrote:
> 
> While I am in the current workspace ws3 I perform the merge
> 
> git merge ws4 ws2 ws5
> 
> Obviously I obtain conflicts between changes in ws3 and ws2 which I fix 
> manually and afterwards I commit the new version of ws3.

In doing that last step, you ignored the crucial bit of advice printed
by the octopus merge:

  Automated merge did not work.
  Should not be doing an Octopus.		# <<--
  Merge with strategy octopus failed.

You should simply merge and resolve them separately, not least of all
because in doing so, 'git show $merge' will display your merge
resolutions.  An octopus would tangle all resolutions into a single
commit.

AFAIK the only thing that can be considered a bug here is that the
octopus strategy leaves your worktree in need of 'reset --hard'.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch