Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge
- From
Horst H. von Brand <vonbrand@inf.utfsm.cl>
- Date
- Jan 4, 2007, 16:31 UTC
- Message-ID
- <200701041631.l04GV2tf015536@laptop13.inf.utfsm.cl>
- In-Reply-To
- <ae@op5.se>
Andreas Ericsson <ae@op5.se> wrote:
Show 18 quoted lines
> Junio C Hamano wrote: > > "Shawn O. Pearce" <spearce@spearce.org> writes: > > > >> Junio C Hamano <junkio@cox.net> wrote: > >>> After a pull that results in a conflicted merge, a new user > >>> often tries another "git pull" in desperation. When the index > >>> is unmerged, merge backends correctly bail out without touching > >>> either index nor the working tree, so this does not make the > >>> wound any worse. > >> I've seen this many times too. I don't understand why users cannot > >> read output messages and realize the current command failed, but > >> they don't. *sigh* > > That is not user's fault. Tools should not make things worse > > when run more than once after they failed, and we do not either, > > so it is not a stupid behaviour on the user's part to do that. > > We just need to make sure that it is more clear to the user that > > pull after a conflicted pull is futile, which is what this patch > > does.
> "Pulling is futile. Nothing will be assimilated" ?
:-)
Been there, done that. The messages git gives don't give a (at this point probably panicked) newbie any clue what to try next, or how to go back.
Perhaps best would be to offer some way to undo all and then try again?
Also, if a manual fix of the merge is warranted, the message doesn't give clear directions on what to do next. Sure, you edit the offending files to your liking, then what? "git commit" shows a scary commit message, you abort the edit and the merge is commited anyway.
-- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 2654431 Universidad Tecnica Federico Santa Maria +56 32 2654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 2797513