{"thread":{"id":"1666","subject":"Re: baffled again","startedAt":"2005-08-26T19:50:39Z","lastAt":"2005-08-26T19:50:39Z","messageCount":1,"participants":["Horst von Brand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7819","messageId":"200508261950.j7QJodQX024981@laptop11.inf.utfsm.cl","threadId":"1666","inReplyTo":"tony.luck@gmail.com","subject":"Re: baffled again","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-08-26T19:50:39Z","receivedAt":"2005-08-26T19:50:39Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Tony Luck <tony.luck@gmail.com> wrote:\n> >  * Even if it does always choose the nicer choice of the two,\n> >    Tony was lucky (no pun intended).  Rather, we were lucky that\n> >    Tony was observant.  A careless merger may well have easily\n> >    missed this mismerge (from the human point of view).\n\n> Actually I can't take credit here. This was a case of the \"many-eyes\" of\n> open source working at its finest ... someone e-mailed me and told me\n> that I should have backed out the old patch before applying the new one.\n> While typing the e-mail to say that I already had in the release branch,\n> I found the problem that it had been \"lost\" in the merge into the test\n> branch.\n\n> But this is a good reminder that merging is not a precise science, and\n> there is more than one plausible merge in many situations ... and while\n> GIT will pick the one that you want far more often than not, there is\n> the possibility that it will surprise you.  Maybe there should be a note\n> to this effect in the tutorial.  Git is not magic, nor is it imbued with\n> DWIM technology.\n\nI have to disagree. If in some corner case it can do the wrong thing, no\namount of \"I told you so in the docu!\" will save the day. People /will/\noverlook it, or be bitten when they have all but forgotten about it.\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"}]}