From: david@lang.hm Date: Wed, 15 Oct 2008 19:09:25 GMT Subject: Re: Untracked working tree files Message-ID: In-Reply-To: <20081015115654.fb34438f.akpm@linux-foundation.org> On Wed, 15 Oct 2008, Andrew Morton wrote: > Date: Wed, 15 Oct 2008 11:56:54 -0700 > From: Andrew Morton > To: git@vger.kernel.org > Subject: Untracked working tree files > > I often get this (running git 1.5.6.rc0 presently): > > y:/usr/src/git26> git-checkout linux-next > error: Untracked working tree file 'arch/x86/kernel/apic.c' would be overwritten by merge. > > which screws things up. I fix it by removing the offending file, which > gets irritating because git bails out after the first such instance, so > I need to rerun git-checkout once per file (there are sometimes tens of them). what I do when I run into this is "git reset --hard HEAD" which makes all files in the working directory match HEAD, and then I can do the other checkout. David Lang > Should this be happening? I don't know what causes it, really. All > I've been doing in that directory is running `git-checkout' against > various maintainers' trees. 95% of the time this works OK but > eventually git seems to get all confused and the above happens. > > Is there some way in which I can work around this with a single command > rather than having to run git-checkout once per offending file? I > suppose a good old `rm -rf *' would do it... > > Thanks. > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >