Re: git svn rebase - could not detach HEAD

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Aug 7, 2008, 07:41 UTC
Message-ID: <20080807074117.GA7648@atjola.homenet>
In-Reply-To: <f7d8f60b0808070033g7a322ee4w9147dd51e41850c6@mail.gmail.com>

On 2008.08.07 19:33:36 +1200, Tony Stubbs wrote:

Show 5 quoted lines

> Ok, woah. that's really weird... note the strange behaviour of
> git-clean (i had my ide open, then clossed it. but it still acted
> strange)
> 
> that seems to have got it. so are you going to apply that patch to git proper?

It already is.

Show 17 quoted lines

> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git clean -df
> Removing Utilities/.apt_src/
> Removing Utilities/build/
> 
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git clean -df
> 
> stubbsa@VFNZV95336 /cygdrive/c/dev
> $ git rebase git-svn
> First, rewinding head to replay your work on top of it...
> error: Untracked working tree file
> 'webnonline-db-access/target/hanson-db-access-1.0.jar' would be
> overwritten by merge.
> could not detach HEAD
> 
> <manually deleted "untracked file" here>

Maybe you're ignoring that file? git clean deletes ignored files only if you use -x/-X.

Björn