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

Re: Fatal error from git bisect

From
Linus Torvalds <torvalds@osdl.org>
Date
Feb 9, 2006, 19:50 UTC
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
Previous: Mark E Mason
Message 2 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.