title: Git: The following untracked working tree files would be overwritten by merge: upload/.DS_Store
body: <p>I'm a git newbie and am having an annoying error. I've spent a few hours going through different posts on StackOverflow to see how other users solved this, but nothing is working for me.</p>
  
  <p>When pulling from the repo, I get the following error:</p>
  
  <blockquote>
    <p>error: The following untracked working tree files would be overwritten by merge: upload/.DS_Store</p>
  </blockquote>
  
  <ul>
  <li>I deleted .DS_Store from my Mac, but it just recreated the file.</li>
  <li>I tried <code>git add .</code>, <code>git stash</code>, <code>git pull</code> and still got the error.</li>
  <li>I added .DS_Store to <code>.gitignore</code>, but I still get the error.</li>
  </ul>
  
  <p>I have no idea what to do.</p>