error: The following untracked working tree files would be overwritten by merge: .DS_Store

.DS_Store

is a Mac related file that is created every time you touch some directory (if I'm not mistaken, it is used for indexing).

So, first you don't have it. Then you try to bring some files/folders into your directory (and thus it gets created - breaking your pull command).

In your repo directory create a file called .gitignore and inside it have a single line (so far) .DS_Store. This should fix your problem.

I solved it by deleting .DS_Store from the git origin repository.