From: Linus Torvalds Date: Fri, 01 Dec 2006 07:53:21 GMT Subject: Re: Resolving conflicts Message-ID: In-Reply-To: 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.