title: Git merge after fetch - how, exactly?
body: <p>I've read from various sources that it's usually a better idea to fetch <em>then</em> 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:</p>
  
  <p>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 <em>my</em> local master branch.  <code>git branch</code> lists all of the local branches I have, but nothing indicating anything to merge to.</p>
  
  <p>So, is it just something like <code>git merge master</code> or <code>git merge origin/master</code>?  What am I missing?</p>