From: Petr Baudis Date: Sun, 23 Oct 2005 22:40:22 GMT Subject: Re: LCA2006 Git/Cogito tutorial Message-ID: <20051023224022.GX30889@pasky.or.cz> In-Reply-To: <200510231533.j9NFXhOv019272@inti.inf.utfsm.cl> Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter where Horst von Brand told me that... > Martin Langhoff (CatalystIT) 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.