On 16 November 2010 11:26, demerphq <demerphq@xxxxxxxxx> 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/" -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html