title: Not my files in git status after conflict resolution
body: <p>I did <code>git pull</code> and Git shows me:</p>
  
  <blockquote>
    <p>error: Your local changes to the following files would be overwritten by merge:
    ..files list...
    Please, commit your changes or stash them before you can merge.</p>
  </blockquote>
  
  <p>OK, I added files in Git, committed my changes and then I did <code>git pull</code> again, Git shows:</p>
  
  <blockquote>
    <p>Automatic merge failed; fix conflicts and then commit the result</p>
  </blockquote>
  
  <p>So I fixed the problematic files and I did <code>git status</code>. But there are many files in the list that I didn't change. They seem like files that I got by pulling. Is it normal or do I have to do something before I commit?</p>