Re: LCA2006 Git/Cogito tutorial
Petr Baudis <pasky@suse.cz> wrote:
Show 5 quoted lines
> 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.
--
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
Horst von Brand <vonbrand@inf.utfsm.cl>