{"thread":{"id":"6219","subject":"Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge","startedAt":"2007-01-04T16:31:02Z","lastAt":"2007-01-11T17:28:32Z","messageCount":2,"participants":["Horst H. von Brand"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"30820","messageId":"200701041631.l04GV2tf015536@laptop13.inf.utfsm.cl","threadId":"6219","inReplyTo":"ae@op5.se","subject":"Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2007-01-04T16:31:02Z","receivedAt":"2007-01-04T16:31:02Z","isPatch":true,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Andreas Ericsson <ae@op5.se> wrote:\n> Junio C Hamano wrote:\n> > \"Shawn O. Pearce\" <spearce@spearce.org> writes:\n> >\n> >> Junio C Hamano <junkio@cox.net> wrote:\n> >>> After a pull that results in a conflicted merge, a new user\n> >>> often tries another \"git pull\" in desperation.  When the index\n> >>> is unmerged, merge backends correctly bail out without touching\n> >>> either index nor the working tree, so this does not make the\n> >>> wound any worse.\n> >> I've seen this many times too.  I don't understand why users cannot\n> >> read output messages and realize the current command failed, but\n> >> they don't.  *sigh*\n> > That is not user's fault.  Tools should not make things worse\n> > when run more than once after they failed, and we do not either,\n> > so it is not a stupid behaviour on the user's part to do that.\n> > We just need to make sure that it is more clear to the user that\n> > pull after a conflicted pull is futile, which is what this patch\n> > does.\n\n> \"Pulling is futile. Nothing will be assimilated\" ?\n\n:-)\n\nBeen there, done that. The messages git gives don't give a (at this point\nprobably panicked) newbie any clue what to try next, or how to go back.\n\nPerhaps best would be to offer some way to undo all and then try again?\n\nAlso, if a manual fix of the merge is warranted, the message doesn't give\nclear directions on what to do next. Sure, you edit the offending files to\nyour liking, then what? \"git commit\" shows a scary commit message, you\nabort the edit and the merge is commited anyway.\n-- \nDr. Horst H. von Brand                   User #22616 counter.li.org\nDepartamento de Informatica                    Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria             +56 32 2654239\nCasilla 110-V, Valparaiso, Chile               Fax:  +56 32 2797513\n"},{"id":"31480","messageId":"200701111728.l0BHSWu1031430@laptop13.inf.utfsm.cl","threadId":"6219","inReplyTo":"ae@op5.se","subject":"Re: [BUG] OSX ends with \"install: git-init.1: No such file or directory\"","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2007-01-11T17:28:32Z","receivedAt":"2007-01-11T17:28:32Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Andreas Ericsson <ae@op5.se> wrote:\n> Junio C Hamano wrote:\n> > merlyn@stonehenge.com (Randal L. Schwartz) writes:\n\n[...]\n\n> >> That's not good. Making git-init-db when it wants git-init.\n\n> > Not good.  I am _very_ tempted to do this.\n> > [Creates a stub manpage, saying git-init is a silly synonym for\n> >  git-init-db]\n\n> Perhaps, but \"git init-db\" does a lot more than just initialise the\n> object database (such as setting default config-variables, installing\n> template hooks...). \"git init\" is actually a more sensible name now\n> adays.\n\nChanging the name of a command is a delicate matter... sounds sensible, but\nthen make it git-init is new name in 1.5.0 (or right now) with a link to\nthe older one (and squeak about the name change when called as\ngit-init-db), and git-init-db is gone by 2.0.0\n-- \nDr. Horst H. von Brand                   User #22616 counter.li.org\nDepartamento de Informatica                    Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria             +56 32 2654239\nCasilla 110-V, Valparaiso, Chile               Fax:  +56 32 2797513\n"}]}