Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter where Horst von Brand <vonbrand@inf.utfsm.cl> told me that... > Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote: > [...] > > MERGE ERROR: : Not handling case -> -> > > It happens when a new file with the same name appears in both parents. For > example, we both see the need for a README file, and then I pull from you > and try to merge into my version. It certainly shouldn't happen with precisely that error message - there should be at least something written between the arrows. And yes, there are unhandled cases like that, as I wrote in one of my other mails. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Oct 24 08:40:57 2005
This archive was generated by hypermail 2.1.8 : 2005-10-24 08:41:01 EST