[darcs-users] Re: [Haskell-cafe] fptools in darcs now available

zooko at zooko.com zooko at zooko.com
Fri Apr 29 10:54:42 EDT 2005

> I don't know if this is what you call a "doppleganger patch", but a lot
> of times when I try this, I have a problem because files with the same
> name are added at some point in the history of both trees (even if the
> current versions don't conflict), and this leads to the spinning
> conflict resolution.
> Commonly seen with files named Makefile and the like.

Yes, I believe this is an instance of the same problem.

This can be avoided by adding them in differently-named subdirectories in the
first place.



More information about the Haskell-Cafe mailing list