title: Git Pull Failed:(Tricky) Your local changes would be overwritten by merge
body: <p>Git Pull Failed: Your local changes would be overwritten by merge.Commit, stash or revert them to proceed.
  When I click the link to see the files, I see a file named Environment.config. Surprisingly, I have it in my .gitignore file along with Run.config, like..</p>
  
  <pre><code># General Config files, both originally tracked(but modified for only this project)
  Run.config
  Environment.config 
  </code></pre>
  
  <p>First, I don't know why only Environment.config is pointed out being changed even though both the files have been changed for my local project and entered in to .gitignore file.</p>
  
  <p>Second, I ran this command to remove the file from being tracked.</p>
  
  <pre><code>git update-index --assume-unchanged &lt;file&gt;
  </code></pre>
  
  <p>I could able to push with out my local changes being sent to the remote. But after some development, when I try to commit, then pull from remote, I am getting in to this "Git Pull Failed" situation. </p>
  
  <p>When I checked the local changes by 'git status' or IntelliJ tool local changes view, I don't find none.
  Why this phantom file change is being reported ? </p>