From: demerphq <demerphq@gmail.com>
Date: Tue, 16 Nov 2010 10:38:44 GMT
Subject: Re: Bogus error: Untracked working tree file '....' would be overwritten by merge. Aborting
Message-ID: <AANLkTimAgDDkPowrfF2QNDdLaxHEyOPVgFy=5rafPWoj@mail.gmail.com>
In-Reply-To: <AANLkTinv7XsXNR2MMbaGAUo2=WgL6SEWkuzwGU_7YVn0@mail.gmail.com>

On 16 November 2010 11:26, demerphq <demerphq@gmail.com> wrote:
> The error in the subject line is generated if one has a git repo
> checked out to a commit that adds a new file and one does something
> like:
>
> git reset HEAD^
>
> and then a merge operation that involves going forward onto or past HEAD.

In fact there are more operations where this can happen.  A
failed/aborted rebase. A failed/aborted merge.  etc.

All of them, so far in my experience, resulting in this bogus error
about overwriting a file with itself.

cheers,
Yves



-- 
perl -Mre=debug -e "/just|another|perl|hacker/"