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

git bisect: merge problem with deleted file

From
MRMeelis Roos <mroos@linux.ee>
Date
Jul 27, 2006, 19:37 UTC
Message-ID
<Pine.SOC.4.61.0607272235100.19826@math.ut.ee>
mroos@nartsiss:~/compile/linux-2.6$ git bisect start
mroos@nartsiss:~/compile/linux-2.6$ git bisect good 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3
mroos@nartsiss:~/compile/linux-2.6$ git bisect bad 9676489866a75fdd56b0d3e40ec7884298bb1338
Bisecting: 43 revisions left to test after this
fatal: Untracked working tree file 'Documentation/filesystems/devfs/ChangeLog' would be overwritten by merge.

Got this while trying to bisec Linus' linux-2.6 tree. I have 1 uncommited change in the tree so this might influence the need for merging.

-- 
Meelis Roos (mroos@linux.ee)
Message 1 of 1 in “git bisect: merge problem with deleted file”
  1. Meelis RoosJul 27, 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.