threads / discuss / 5025

git bisect: merge problem with deleted file

Subject: git bisect: merge problem with deleted file

## tl;dr

One message between Jul 27, 2006 and Jul 27, 2006.

replies: 0people: 1as markdown or json

Meelis Roos· Jul 27, 2006, 19:37 UTC · lore
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)

← back to recent threads