title: Git - How to merge a remote branch into remote master
body: <p>So here's the situation.</p>
  
  <p>I created a local branch.  Then I pushed that local branch to github.  So github now has two branches.</p>
  
  <p>Now I want to merge the two branches together both locally and on github.  </p>
  
  <p>This is probably a dumb question but somehow I'm not seeing it in the documentation.</p>
  
  <p>So far my best guess is to merge locally, and then delete the remote branch from github?</p>