{"thread":{"id":"5025","subject":"git bisect: merge problem with deleted file","startedAt":"2006-07-27T19:37:35Z","lastAt":"2006-07-27T19:37:35Z","messageCount":1,"participants":["Meelis Roos"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"24249","messageId":"Pine.SOC.4.61.0607272235100.19826@math.ut.ee","threadId":"5025","inReplyTo":null,"subject":"git bisect: merge problem with deleted file","fromName":"Meelis Roos","fromEmail":"mroos@linux.ee","sentAt":"2006-07-27T19:37:35Z","receivedAt":"2006-07-27T19:37:35Z","isPatch":false,"sender":{"key":"mroos@linux.ee","avatar":null},"body":"mroos@nartsiss:~/compile/linux-2.6$ git bisect start\nmroos@nartsiss:~/compile/linux-2.6$ git bisect good 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3\nmroos@nartsiss:~/compile/linux-2.6$ git bisect bad 9676489866a75fdd56b0d3e40ec7884298bb1338\nBisecting: 43 revisions left to test after this\nfatal: Untracked working tree file 'Documentation/filesystems/devfs/ChangeLog' would be overwritten by merge.\n\nGot this while trying to bisec Linus' linux-2.6 tree. I have 1 \nuncommited change in the tree so this might influence the need for \nmerging.\n\n-- \nMeelis Roos (mroos@linux.ee)\n"}]}