title: Git pull failing due to "local changes" even when there are none?
body: <p>When I try and pull from origin develop im getting this error: </p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
      filepath/file
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>However filepath/file is in the git ignore file so when I type <code>git status</code> I dont see any changes that I could revert. </p>