I always use "fetch" instead of "pull" for this reason--I want to update all my remote branches first, and then consider merging with local branches.
It seems that a lot of new git users default to "pull" and I'm not sure why. There must be some really popular tutorial out there that starts with pull.
"git pull" is the closest equivalent to what people are used to from many other source control systems where there is no concept of a local copy of remote branches.
It seems that a lot of new git users default to "pull" and I'm not sure why. There must be some really popular tutorial out there that starts with pull.