Re: Resolving conflicts

From: Linus Torvalds <torvalds@osdl.org>
Date: Dec 1, 2006, 07:53 UTC
Message-ID: <Pine.LNX.4.64.0611302348370.3695@woody.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0611302330000.3695@woody.osdl.org>

On Thu, 30 Nov 2006, Linus Torvalds wrote:

> 
> So my guess is that there wasn't actually a conflict at all, but the 
> "merge" program (usually in /usr/bin/merge) returned an error for some 
> reason. What does "which merge" and "rpm -qf /usr/bin/merge" say?

Side note: the historically more common failure was to not have a merge program at all, but exactly because that was common, we check for that and complain about it. So that's not it for you - you do have a 'merge' program somewhere that git found.

But if it returns the wrong error code, or doesn't do anything at all (ie you have "merge", but it's not the 3-way merge we expect, or it doesn't take the "-L" argument we use, or it's simply buggy) then that might explain the behaviour you report.

Or it might be something totally different. This is just a wild theory.