From: Horst von Brand <vonbrand@inf.utfsm.cl>
Date: Sun, 23 Oct 2005 15:33:43 GMT
Subject: Re: LCA2006 Git/Cogito tutorial
Message-ID: <200510231533.j9NFXhOv019272@inti.inf.utfsm.cl>
In-Reply-To: <martin@catalyst.net.nz>

Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:

[...]

> If you combine the coolness of git-merge.sh with the fact that
> cg-merge right now is buggy[*]... I'm starting to rely on doing
> cg-fetch and running git-merge.sh by hand.
> 
> * I just merged your latest fixes, knowing that they'd conflict on
> * cg-fetch, but the merge didn't say a thing a bout cg-fetch, and only
> * complained like this:
> 
>     MERGE ERROR: : Not handling case  ->  ->
> 
> But there were no conflicts at all in the tree! It seems to be that
> it's dropping the upstream changes it doesn't like.

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.
-- 
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