> 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. Regards, Zooko _______________________________________________ Haskell-Cafe mailing list [email protected] http://www.haskell.org/mailman/listinfo/haskell-cafe
