Re: Git rebase failure: .dotest overwritten

From: Stephan Beyer <s-beyer@gmx.net>
Date: Jul 15, 2008, 21:22 UTC
Message-ID: <20080715212211.GL6244@leksak.fem-net>
In-Reply-To: <73fd69b50807151408i6a916da6p7b89fe81e65fc717@mail.gmail.com>

Hi,

Joe Fiorini wrote:

Show 8 quoted lines

> A friend of mine asked me for help with a git rebase problem.  I was
> clueless.  Here is what he was seeing:
> The main problem seems to be the following error: "fatal: Untracked
> working tree file '.dotest/0001' would be overwritten by merge."; also
> all the files that it says "already exist in working directory" did
> not exist before he ran the rebase.  Maybe it's trying to run the
> rebase more than once? His working copy was clean.  Any thoughts?  Any
> other details I can provide?

git-rebase (without -i/-m) generates a directory called ".dotest/" to save temporary stuff like the commits you want to rebase.

And it seems that at least one commit in his repo has .dotest/* files
in the tree, so that message occurs.
Hmm, he should perhaps clean that commit up and remove the .dotest
files from it. (After figuring out that commit, he could try
	git rebase -i ...
and change the "pick" line to "edit".)

Regards.

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F