3 ms·
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 (aga
by ehotinger 11y ago
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).
- lifebeyondfife 11y agoBeat me to it.
- c0wb0yc0d3r 11y agogit pull just runs git fetch then git merge. At least that is what the docs say: http://git-scm.com/docs/git-pull http://git-scm.com/docs/git-pull What am I missing?
- gcb0 11y agobut 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.
- Kiro 11y agoWhy?