title: Why is Git saying file is 'deleted by us' when I haven't touched it?
body: <p>I adjusted 2 files and went to merge them to Github. However, when I run a push I get an error:</p>
  
  <pre><code>Unmerged paths:
  #   (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  #       deleted by us:   somefolder/somefile.ext
  </code></pre>
  
  <p>However, I have not touched this file. When looking at my local directory I see the file is still very much intact.</p>
  
  <p>Would anyone know why this is occurring and what I can do about it?</p>