title: error: The following untracked working tree files would be overwritten by merge: .gitignore
body: <p>I am working on a web app with Angular JS. After Commit, I am trying to Pull the latest version of the other web developer to merge it with mine before I Push my latest changes.
  I am getting this error and don't know why is this happening because I had no problem on the previous pull / push.</p>
  
  <pre><code>error: The following untracked working tree files would be overwritten by merge:
  .gitignore
  Please move or remove them before you can merge.
  </code></pre>