{"thread":{"id":"3275","subject":"Fatal error from git bisect","startedAt":"2006-02-09T18:51:25Z","lastAt":"2006-02-09T19:50:49Z","messageCount":2,"participants":["Mark E Mason","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"15794","messageId":"7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com","threadId":"3275","inReplyTo":null,"subject":"Fatal error from git bisect","fromName":"Mark E Mason","fromEmail":"mark.e.mason@broadcom.com","sentAt":"2006-02-09T18:51:25Z","receivedAt":"2006-02-09T18:51:25Z","isPatch":false,"sender":{"key":"mark.e.mason@broadcom.com","avatar":null},"body":"Hello,\n \nI'm trying to use 'git bisect' and am running into the following error:\n\n[mason@hawaii linux.git]$ git bisect reset\n[mason@hawaii linux.git]$ git bisect start\n[mason@hawaii linux.git]$ git bisect good\nd166b5a220813a08a79312fc384d11e1c57e9072\n[mason@hawaii linux.git]$ git bisect bad\na7900c9bdb64c11688719bef9f6373fbc4c276ab\nBisecting: 116 revisions left to test after this\nfatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot\nmerge.\n\n(this is the linux-mips.org kernel repository, a7900c9b is a child of\nd166b5a2).\n\nWhat does this mean?  How do I get around it?\nAs you can probably guess, I'm a beginner to git bisect.\n\nThanks in advance.\nMark\n"},{"id":"15796","messageId":"Pine.LNX.4.64.0602091148080.2458@g5.osdl.org","threadId":"3275","inReplyTo":"7E000E7F06B05C49BDBB769ADAF44D0773A48E@NT-SJCA-0750.brcm.ad.broadcom.com","subject":"Re: Fatal error from git bisect","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-09T19:50:49Z","receivedAt":"2006-02-09T19:50:49Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\nOn Thu, 9 Feb 2006, Mark E Mason wrote:\n>  \n> I'm trying to use 'git bisect' and am running into the following error:\n>\n> fatal: Entry 'block/elevator.c' would be overwritten by merge. Cannot merge.\n\nThis seems to mean that you have a dirty block/elevator.c file. Have you \nperhaps edited it?\n\n\t\tLinus\n"}]}