Re: Pull is Evil

On Fri, 02 May 2014 10:46:09 +0000, David Kastrup wrote:
...

What the gibbins?  I don't even use git pull.

I do, but I watch for the fast-forward message
and undo as appropriate.

I use git fetch, and then, depending on my needs, I rebase or merge.

I wouldn't mind that, but I have a century of newbies who are used
to having other people's changes appear in their workspace without
any interaction. Teaching them the mainline thing (aka first-parent)
and the commands to properly merge&push is...tricky.

And that goes for every user base, so some improvement would be
greatly appreciated.

Andreas

-- 
"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800