title: Git pull - Please move or remove them before you can merge
body: <p>I am trying to do a <code>git pull origin master</code> from my server but keep getting the error:</p>
  
  <p><code>Please move or remove them before you can merge.</code></p>
  
  <p>There are no untracked files, but it seems like it has issues with the <em>ignored files</em> for some reason.</p>
  
  <p>I tried running a <code>git clean -nd</code> to see what would be deleted and it lists a whole bunch of files that are ignored in <code>.gitignore</code>.</p>
  
  <p>How can I fix this so I can do a pull?</p>