title: Git merge conflicts where HEAD + commit are identical
body: <p>I just ran a <code>git pull origin master</code> and many of the merge conflicts are identical in HEAD and the upstream commit:</p>
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  gem 'fuzzy-string-match'
  =======
  gem 'fuzzy-string-match'
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 50147a3519be5bc883dabce86525ee4f36640b22
  </code></pre>
  <p>There are dozens of files with the same situation, where the before and after are identical.</p>
  <p>Does anyone know what might cause this behavior? Or if there's a way to auto-merge these &quot;conflicts&quot;?</p>