git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Fatal error from git bisect

From
MMMark E Mason <mark.e.mason@broadcom.com>
Date
Feb 9, 2006, 18:51 UTC
Message-ID
<7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com>
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

Next: Linus Torvalds
Message 1 of 2 in “Fatal error from git bisect”
  1. Mark E MasonFeb 9, 2006
  2. Linus TorvaldsFeb 9, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.