If git checkout -B master origin/master is not working for you (when you do git pull your local master are still stuck on an older origin/master branch), you can try this:
git remote prune origin
git pull
It should reset your local master to track the latest origin/master.