title: I've merged a branch, but not all changes have merged?
body: <p>I've merged a branch into master:</p>
  
  <pre><code>git checkout master
  git merge work_branch
  </code></pre>
  
  <p>There were some conflicts which I resolved and committed, however there are some changes which didn't come across and I can't figure out why.</p>
  
  <p>If I do <code>git checkout work_branch</code> I can see that the file <code>views.py</code> is different from <code>master</code>, but if I do <code>git merge work_branch</code> from <code>master</code> I get <code>Already up-to-date.</code> What's going on here? I want <code>master</code> to be identical to <code>work_branch</code>.</p>