threads / rfc / 6219

patchRe: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge

Subject: Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge

## tl;dr

2 messages between Jan 4, 2007 and Jan 11, 2007. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Horst H. von Brand· Jan 4, 2007, 16:31 UTC · lore
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
Horst H. von Brand· Jan 11, 2007, 17:28 UTC · lore

Re: [BUG] OSX ends with "install: git-init.1: No such file or directory"

Andreas Ericsson <ae@op5.se> wrote:
> Junio C Hamano wrote:
> > merlyn@stonehenge.com (Randal L. Schwartz) writes:
[...]
> >> That's not good. Making git-init-db when it wants git-init.
> > Not good.  I am _very_ tempted to do this.
> > [Creates a stub manpage, saying git-init is a silly synonym for
> >  git-init-db]
> Perhaps, but "git init-db" does a lot more than just initialise the
> object database (such as setting default config-variables, installing
> template hooks...). "git init" is actually a more sensible name now
> adays.

Changing the name of a command is a delicate matter... sounds sensible, but then make it git-init is new name in 1.5.0 (or right now) with a link to the older one (and squeak about the name change when called as git-init-db), and git-init-db is gone by 2.0.0

-- 
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

← back to recent threads