I've read from various sources that it's usually a better idea to fetch then merge rather than simply pull as it allows for finer control. That said, I've yet to find actually how to do it. Case in point:
There was a small change made to some of the code in one of my GitHub repository's master branch. I was able to fetch it, but I don't know how to actually merge the differences in with my local master branch.
git merge master
git merge origin/master
git merge origin/master should work. Since
master is usually a tracking branch, you could also do
git pull from that branch and it will do a fetch & merge for you.
If you have local changes on your
master that aren't reflected on
origin, you might want
git rebase origin/master to make sure your commits are 'on top'.