title: git merge squash and recurring conflicts
body: <p>I have a git repository with <code>master</code> and <code>alt</code> branches. <code>alt</code> branch contains modified version of <code>master</code> code, and i am trying to merge changes from <code>master</code> to <code>alt</code> like this:</p>
  
  <pre><code>git merge --squash master
  </code></pre>
  
  <p>Merge results in conflict:</p>
  
  <pre><code>Auto-merging myproject/foo/bar
  CONFLICT (content): Merge conflict in myproject/foo/bar
  Squash commit -- not updating HEAD
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>After I resolve conflicts and commit changes everything seems fine, but when i run <code>git merge --squash master</code> again (without doing any changes on any branches) i will get same conflict error.</p>
  
  <p>Why is that? What did i miss?</p>