Petr Baudis <pasky@suse.cz> wrote: > 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. It does now. > And yes, there > are unhandled cases like that, as I wrote in one of my other mails. Yep, thanks! -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 654431 Universidad Tecnica Federico Santa Maria +56 32 654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513 - 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 23:25:04 2005
This archive was generated by hypermail 2.1.8 : 2005-10-24 23:25:08 EST