git is deep. And you can do the same thing using different steps and different number of steps. I think this post provided a good tip on how to go about merging remote changes into your local. If one finds that git pull requires a lot of cleanup activity, git fetch and git merge is a good way to go..