Xcode gives .DS_Store conflict error
The .DS_Store changes when you alter the directory's view options: align, sort order, view mode... You don't need version control on it. To ignore the changes add .DS_Store in the .gitignore or the global one in ~/.config/git/ignore.