* git bisect: merge problem with deleted file
@ 2006-07-27 19:37 Meelis Roos
0 siblings, 0 replies; only message in thread
From: Meelis Roos @ 2006-07-27 19:37 UTC (permalink / raw)
To: git
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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-07-27 19:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-27 19:37 git bisect: merge problem with deleted file Meelis Roos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).