title: Finishing a git merge
body: <p><a href="https://help.github.com/articles/merging-branches/" rel="nofollow">I followed this very simple guide</a> on how to merge two branches using git. I was going to do it from the command line, but to be safe I opted for the GUI version instead.</p>
  
  <p>This process seemed simple enough: I merged my <code>feature-branch</code> into <code>master</code> and I resolved all the merge conflicts. I then made the commit.</p>
  
  <p>I went back to my command line and noticed that <code>feature-branch</code> still existed, so I went to delete it:</p>
  
  <pre><code>git checkout master
  git branch -d feature-branch
  </code></pre>
  
  <p>then, I received the following message:</p>
  
  <pre><code>warning: deleting branch 'feature-branch' that has been merged to
  
       'refs/remotes/origin/feature-branch', but not yet merged to HEAD.
  
  Deleted branch feature-branch (was 288f261).
  </code></pre>
  
  <p>And when I go to the GitHub website, I see that the <code>feature-branch</code> has not been graphically merged into <code>master</code>.</p>
  
  <p>How do I fix this problem and complete the merge?</p>