From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Mark E Mason" <mark.e.mason@broadcom.com>
Subject: Fatal error from git bisect
Date: Thu, 9 Feb 2006 10:51:25 -0800
Message-ID: <7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com>
Mime-Version: 1.0
Content-Type: text/plain;
 charset=us-ascii
Content-Transfer-Encoding: 8BIT
Cc: "Mark E Mason" <mark.e.mason@broadcom.com>
X-From: git-owner@vger.kernel.org Thu Feb 09 19:52:26 2006
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1F7GtQ-0003kY-RD
	for gcvg-git@gmane.org; Thu, 09 Feb 2006 19:51:50 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750703AbWBISvo (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Thu, 9 Feb 2006 13:51:44 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750705AbWBISvo
	(ORCPT <rfc822;git-outgoing>); Thu, 9 Feb 2006 13:51:44 -0500
Received: from mms1.broadcom.com ([216.31.210.17]:35857 "EHLO
	mms1.broadcom.com") by vger.kernel.org with ESMTP id S1750703AbWBISvn convert rfc822-to-8bit
	(ORCPT <rfc822;git@vger.kernel.org>); Thu, 9 Feb 2006 13:51:43 -0500
Received: from 10.10.64.154 by mms1.broadcom.com with ESMTP (Broadcom
 SMTP Relay (Email Firewall v6.2.0)); Thu, 09 Feb 2006 10:51:29 -0800
X-Server-Uuid: F962EFE0-448C-40EE-8100-87DF498ED0EA
Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id
 E59A82AF; Thu, 9 Feb 2006 10:51:27 -0800 (PST)
Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.10.64.221]) by
 mail-irva-10.broadcom.com (Postfix) with ESMTP id D1E892AE for
 <git@vger.kernel.org>; Thu, 9 Feb 2006 10:51:27 -0800 (PST)
Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com
 [10.16.128.215]) by mail-irva-8.broadcom.com (MOS 3.7.3a-GA) with ESMTP
 id CWW16647; Thu, 9 Feb 2006 10:51:26 -0800 (PST)
Received: from NT-SJCA-0750.brcm.ad.broadcom.com (nt-sjca-0750
 [10.16.192.220]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id
 2A3A520502 for <git@vger.kernel.org>; Thu, 9 Feb 2006 10:51:26 -0800 (
 PST)
X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0
Content-class: urn:content-classes:message
Thread-Topic: Fatal error from git bisect
Thread-Index: AcYtqdPNHVZIai1jRUSCkVxm0zlozg==
To: git@vger.kernel.org
X-TMWD-Spam-Summary: SEV=1.1; DFV=A2006020907; IFV=2.0.6,4.0-7;
 RPD=4.00.0004;
 RPDID=303030312E30413039303230362E34334542384435372E303033382D412D;
 ENG=IBF; TS=20060209185133; CAT=NONE; CON=NONE;
X-MMS-Spam-Filter-ID: A2006020907_4.00.0004_2.0.6,4.0-7
X-WSS-ID: 6FF550BB10G9360964-01-01
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/15817>

Hello,
 
I'm trying to use 'git bisect' and am running into the following error:

[mason@hawaii linux.git]$ git bisect reset
[mason@hawaii linux.git]$ git bisect start
[mason@hawaii linux.git]$ git bisect good
d166b5a220813a08a79312fc384d11e1c57e9072
[mason@hawaii linux.git]$ git bisect bad
a7900c9bdb64c11688719bef9f6373fbc4c276ab
Bisecting: 116 revisions left to test after this
fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot
merge.

(this is the linux-mips.org kernel repository, a7900c9b is a child of
d166b5a2).

What does this mean?  How do I get around it?
As you can probably guess, I'm a beginner to git bisect.

Thanks in advance.
Mark