{"thread":{"id":"2100","subject":"Cogito: Merge failure when new remote has been added locally","startedAt":"2005-10-14T01:06:39Z","lastAt":"2005-10-14T01:06:39Z","messageCount":1,"participants":["Horst von Brand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"10088","messageId":"200510140106.j9E16dfn017346@inti.inf.utfsm.cl","threadId":"2100","inReplyTo":null,"subject":"Cogito: Merge failure when new remote has been added locally","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-14T01:06:39Z","receivedAt":"2005-10-14T01:06:39Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"I've set up an example project to play around with cogito/git. To simulate\npatches flowing back and forth I set up several repositories, which I edit\nindependently. In this I run into trouble with a reasonable scenario:\n\n A creates a project, and publishes it\n\n B gets A's version, updates his version, and ships a patch (which creates\n   stack.h) to A\n\n A merges in B's changes, and fixes a typo in stack.h\n\n B tries to update from A via cg-update, the merge fails because there is a\n   local stack.h (which is different than the remote one). The resulting\n   message is less than helpful.\n\nA script showing the problem follows:\n\n   mkdir tst1\n   cd tst1\n   echo \"Initial\" | cg-init\n   \n   cd ..\n   cg-clone tst1 tst2\n\n   cd tst2\n   echo 'Hello!' > greet\n   cg-add greet\n   cg-commit -m \"Add greet\"\n\n   cd ../tst1\n   echo 'Hi there!' > greet\n   cg-add greet\n   cg-commit -m \"Add greet\"\n\n   cd ../tst2\n   cg-update\n\nThis gives:\n\n\n     MERGE ERROR: : Not handling case  ->  ->\n\n            Conflicts during merge. Do cg-commit after resolving them.\n\nAnd there is nothing marked to fix by hand. cg-diff returns an empty\ndifference in greet.\n-- \nDr. Horst H. von Brand                   User #22616 counter.li.org\nDepartamento de Informatica                     Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria              +56 32 654239\nCasilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513\n"}]}