Re: git svn rebase - could not detach HEAD

[Daniel Barkalow <barkalow@iabervon.org>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 958 bytes --]

On Fri, 8 Aug 2008, Tony Stubbs wrote:

> >> <manually deleted "untracked file" here>
> >
> > Maybe you're ignoring that file? git clean deletes ignored files only if
> > you use -x/-X.
> >
> > Björn
> >
> 
> That's probably it, I'll try it tomorrow. However, that could be a
> problem. There's ignored files I don't want to keep (build artifacts),
> and there's ignored files I do want to keep (i.e. .metadata).
> Is there a good solution?

There's only a problem if there's some reason you specifically want to not 
keep an ignored file; this is usually only an issue when you're trying to 
merge/rebase with a branch that has it tracked, at which point you have to 
decide whether to add your version and merge or remove your version. 
Ideally, git would tell you when the file that's in the way is ignored, 
which would probably help you know what's going on, but it's tricky to get 
that information there.

	-Daniel
*This .sig left intentionally blank*