Error when cloning a git repo

Question

remote: Counting objects: 610, done.
remote: Compressing objects: 100% (352/352), done.
remote: Total 610 (delta 296), reused 434 (delta 210)
Receiving objects: 100% (610/610), 5.50 MiB | 2.19 MiB/s, done.
Resolving deltas: 100% (296/296), done.
error: Untracked working tree file '.DS_Store' would be overwritten by merge.

So, then, I'm left with an empty repository. I just added .DS_Store to my .gitignore file, but it seems I can't even pull a clean copy to my local machine.

Answer 1

So, I use Tower as my Git client on the Mac. What worked for me was to first ignore all .DS_Store files in Tower by right clicking on the file in Tower and selecting "Ignore...". Tower then asks if I want to untrack the file, and I said yes, which issues a delete of the file on the remote repository. This was on the machine where I initially accidentally pushed the .DS_Store file from.

Answer 2

Adding to .gitignore will not solve your problem. It looks like the file is already in the repo. ( Remove it and then add it to gitignore)

You can delete the .DS_Store on a Mac using the Terminal.

Have a look at this discussion here: http://support.github.com/discussions/repos/503-untracked-working-tree

And this: http://support.github.com/discussions/repos/3712-ds_store

Answer 3

Try removing your existing .DS_Store file first.