{"thread":{"id":"2201","subject":"Merge failure problem with cogito: How to fixup?","startedAt":"2005-10-23T15:57:51Z","lastAt":"2005-10-23T22:32:40Z","messageCount":2,"participants":["Horst von Brand","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"10489","messageId":"200510231557.j9NFvptA020919@inti.inf.utfsm.cl","threadId":"2201","inReplyTo":null,"subject":"Merge failure problem with cogito: How to fixup?","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-23T15:57:51Z","receivedAt":"2005-10-23T15:57:51Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"When doing the following:\n\n   mkdir /tmp/tst1\n   cd /tmp/tst1\n   echo \"Initial\" | cg-init \n      \n   cd /tmp\n   cg-clone tst1 tst2\n   \n   cd /tmp/tst1\n   echo 'Hi there!' > greet\n   cg-add greet\n   cg-commit -m \"Add greet\"\n   \n   cd /tmp/tst2\n   echo 'Hello!' > greet\n   cg-add greet\n   cg-commit -m \"Add greet\"\n\n   cg-update\n\nI get a message to the end that the merge doesn't work, and that I have to\nfix up by hand. The resulting greet file has no merge markers, plain\n\"cg-diff\" is useless. How am I supposed to find out what the problem is?\n\nYes, \"cg-diff -r origin:HEAD\" does the trick, but...\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"},{"id":"10500","messageId":"20051023223240.GU30889@pasky.or.cz","threadId":"2201","inReplyTo":"200510231557.j9NFvptA020919@inti.inf.utfsm.cl","subject":"Re: Merge failure problem with cogito: How to fixup?","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-23T22:32:40Z","receivedAt":"2005-10-23T22:32:40Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Oct 23, 2005 at 05:57:51PM CEST, I got a letter\nwhere Horst von Brand <vonbrand@inf.utfsm.cl> told me that...\n> When doing the following:\n> \n>    mkdir /tmp/tst1\n>    cd /tmp/tst1\n>    echo \"Initial\" | cg-init \n>       \n>    cd /tmp\n>    cg-clone tst1 tst2\n>    \n>    cd /tmp/tst1\n>    echo 'Hi there!' > greet\n>    cg-add greet\n>    cg-commit -m \"Add greet\"\n>    \n>    cd /tmp/tst2\n>    echo 'Hello!' > greet\n>    cg-add greet\n>    cg-commit -m \"Add greet\"\n> \n>    cg-update\n> \n> I get a message to the end that the merge doesn't work, and that I have to\n> fix up by hand. The resulting greet file has no merge markers, plain\n> \"cg-diff\" is useless. How am I supposed to find out what the problem is?\n> \n> Yes, \"cg-diff -r origin:HEAD\" does the trick, but...\n\nWell, yes, that's one of the \"unhandled merge cases\". :-)\n\nTo fixup:\n\n\t<resolve the merge somehow, probably adding greet in some form>\n\tcg-add greet\n\n(You should be able to cg-rm greet instead if you decide to drop the\nfile after all.)\n\nThis is a _trick_ and it works just because cg-add and cg-rm purely\naccidentally do the right GIT commands to also resolve an index-level\nmerge conflict. The proper solution would be to add the proper case to\ncg-Xmergefile, which should be actually pretty easy, if only someone\ndoes it... ;-)\n\nOk, and cg-status should be taught about it and report \"greet\" somehow\nas a conflict until you choose one of the versions.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"}]}