News for hackers. Stuff that matters.

A comment on Ask HN: Google/FB engineers, Do you like Mercurial?. Parent comment

Re:Ask HN: Google/FB engineers, Do you like Mercurial? by ehotinger on Thursday May 07, 2015 @09:25AM (#9504840)
Nothing unless you're rebasing upstream, but I think the point he was trying to make was that you should always run `git fetch` and then `merge` from there (again, there are some situations where the pull is fine IMHO).
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by c0wb0yc0d3r on Thursday May 07, 2015 @09:44AM (#9504953)
git pull just runs git fetch then git merge.

At least that is what the docs say: http://git-scm.com/docs/git-pull

What am I missing?

[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by gcb0 on Tuesday May 12, 2015 @09:17PM (#9536123)
but it tries to be smart about how to merge. and usually it's not what you want. i consider it the clippy of linus.

if you run merge/rebase/etc on its own, it will tell and ask you about anything out of the ordinary and then there's no surprise.

again, it's all about avoiding errors on the rare cases because you developed dangerous finger memory.

[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by lifebeyondfife on Thursday May 07, 2015 @09:30AM (#9504863)
Beat me to it.
[ Parent | on HN ]
Re:Ask HN: Google/FB engineers, Do you like Mercurial? by Kiro on Thursday May 07, 2015 @10:52AM (#9505454)
Why?
[ Parent | on HN ]