title: error: The following untracked working tree files would be overwritten by merge: .DS_Store
body: <p>I have a git repository on a mac, when I use <code>git status</code> in terminal it says</p>
  
  <pre><code>On branch master
  nothing to commit, working directory clean
  </code></pre>
  
  <p>when I try to pull changes from repository <code>git pull repositoryName master</code></p>
  
  <pre><code>error: The following untracked working tree files would be overwritten by merge:
  .DS_Store
  Please move or remove them before you can merge.
  </code></pre>
  
  <p>so I tried to remove it with <code>git rm .DS_Store</code> but it says</p>
  
  <pre><code>fatal: pathspec '.DS_Store' did not match any files
  </code></pre>
  
  <p>I then tried to remove the cached file and add it again with <code>git rm --cached . -r</code> and <code>git add .</code> with a .gitignore directive that would ignore .DS_Store but the problem still persists.</p>
  
  <p>I tried lots of commands that I saw on different posts without success. Any help would be appreciated.</p>