# Re: LCA2006 Git/Cogito tutorial 3 messages from 2005-10-23 to 2005-10-24. Participants: Horst von Brand, Petr Baudis, Martin Langhoff. Thread: https://gitlist.dev/t/2202 ## Horst von Brand, 2005-10-23 15:33 Subject: Re: LCA2006 Git/Cogito tutorial Message-ID: <200510231533.j9NFXhOv019272@inti.inf.utfsm.cl> URL: https://gitlist.dev/e/200510231533.j9NFXhOv019272%40inti.inf.utfsm.cl In-Reply-To: ``` Martin Langhoff (CatalystIT) 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 ``` ## Petr Baudis, 2005-10-23 22:40 Subject: Re: LCA2006 Git/Cogito tutorial Message-ID: <20051023224022.GX30889@pasky.or.cz> URL: https://gitlist.dev/e/20051023224022.GX30889%40pasky.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. ``` ## Martin Langhoff, 2005-10-24 06:25 Subject: Re: LCA2006 Git/Cogito tutorial Message-ID: <46a038f90510232325y8fbea09g19bae8c95f5a7aa0@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90510232325y8fbea09g19bae8c95f5a7aa0%40mail.gmail.com In-Reply-To: <20051023224022.GX30889@pasky.or.cz> ``` On 10/24/05, Petr Baudis wrote: > 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. As I painfully discovered later, I had updated my tree at the wrong time, and got caught with a cg-Xmerge.sh that had lost all its parameters over the numbered params/named params transition. I got a fresh checkout, rebased my local patches, and life is good again. Sorry about the noise! martin ```