git pull issue

[bnhiebert]

When I try to 'git pull' I get the following error message:

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

There is a lot of information online about how to deal with .DS_Store files but I can't make much sense of it.

[tcatapano]

@bnhiebert : I've put in place a .gitignore file which should take care of the nuisance of .DS_Store files. Try pulling again and let me know if the problem isnt fixed.

[bnhiebert]

@tcatapano Thanks, that did the trick.

[tcatapano]

Excellent. Closing