.DS_Store files are a pain in the git!

When they crop up in your repo, here's what to do. First set up your global gitignore to always ignore these things.

$ git config --global core.excludesfile ~/.gitignore
$ echo *.DS_Store >> ~/.gitignore

Then remove each one from the list of tracked files, and while you are there, you may as well remove the file itself.

$ cd whereever_DS_is
$ git rm --cached .DS_Store
$ rm .DS_Store

There are plenty of resources about this including:

link link