Re: More merge questions (why doesn't this work?)

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 2, 2005, 22:12 UTC
Message-ID: <Pine.LNX.4.64.0512021409320.3099@g5.osdl.org>
In-Reply-To: <20051202213214.27282.qmail@science.horizon.com>

On Fri, 2 Dec 2005, linux@horizon.com wrote:

Show 11 quoted lines

>
> produces...
> 
> + git merge 'Merge a, b, c' master a b c
> Trying simple merge with a
> Trying simple merge with b
> Trying simple merge with c
> Simple merge did not work, trying automatic merge.
> Removing c
> fatal: merge program failed
> No merge strategy handled the merge.

I'm getting

	...
	+ git merge 'Merge a, b, c' master a b c
	Trying simple merge with a
	Trying simple merge with b
	Trying simple merge with c
	Simple merge did not work, trying automatic merge.
	Removing c
	Merge 9ca217790c7e6581fe0b8b3b4baf026d03584c66, made by octopus.
	 a |    1 +
	 b |    1 +
	 c |    1 -
	 3 files changed, 2 insertions(+), 1 deletions(-)
	 delete mode 100644 c

and I don't see why you wouldn't get that too.

Do you have that broken version of git that had problems with "rmdir" and thought the unlink failed?

		Linus