title: error: The following untracked working tree files would be overwritten by checkout
body: <p>When I do <code>git status</code> it says <code>nothing to commit, working directory clean</code></p>
  
  <p>And then I do <code>git pull --rebase</code>, it says: </p>
  
  <pre><code>First, rewinding head to replay your work on top of it...
  error: The following untracked working tree files would be overwritten by checkout:
      includes/resources/moduledata/12/_Fr4_02_Invention_IPA_SR_la-Fête.pdf
  Please move or remove them before you can switch branches.
  Aborting
  could not detach HEAD
  </code></pre>
  
  <p>Similar error when doing <code>git pull origin master</code></p>
  
  <pre><code> * branch            master     -&gt; FETCH_HEAD
  error: The following untracked working tree files would be overwritten by merge:
      includes/resources/moduledata/12/_Fr4_02_Invention_IPA_SR_la-Fête.pdf
  Please move or remove them before you can merge.
  Aborting
  </code></pre>
  
  <p>My <code>.gitignore</code> file:</p>
  
  <pre><code>→ cat .gitignore 
  .htaccess
  bower_components/
  </code></pre>
  
  <p>This file has been coming up constantly and when I remove it from file system, git will say I removed this file, while in the other messages, it says it is untracked. How could it be untracked and tracked at the same time? </p>