From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Feb 2006 19:50:49 GMT
Subject: Re: Fatal error from git bisect
Message-ID: <Pine.LNX.4.64.0602091148080.2458@g5.osdl.org>
In-Reply-To: <7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com>


On Thu, 9 Feb 2006, Mark E Mason wrote:
>  
> I'm trying to use 'git bisect' and am running into the following error:
>
> fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot merge.

This seems to mean that you have a dirty block/elevator.c file. Have you 
perhaps edited it?

		Linus