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 - 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 04:50:13 2005
This archive was generated by hypermail 2.1.8 : 2005-10-24 04:50:17 EST