From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Tony Stubbs <antony.stubbs@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: git svn rebase - could not detach HEAD
Date: Thu, 7 Aug 2008 09:41:17 +0200 [thread overview]
Message-ID: <20080807074117.GA7648@atjola.homenet> (raw)
In-Reply-To: <f7d8f60b0808070033g7a322ee4w9147dd51e41850c6@mail.gmail.com>
On 2008.08.07 19:33:36 +1200, Tony Stubbs wrote:
> 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.
> 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
next prev parent reply other threads:[~2008-08-07 7:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-07 6:49 git svn rebase - could not detach HEAD Tony Stubbs
2008-08-07 7:19 ` Tony Stubbs
2008-08-07 7:20 ` Junio C Hamano
2008-08-07 7:33 ` Tony Stubbs
2008-08-07 7:41 ` Björn Steinbrink [this message]
2008-08-07 12:53 ` Tony Stubbs
2008-08-07 14:24 ` Daniel Barkalow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080807074117.GA7648@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=antony.stubbs@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox