In Xcode I noticed that .DS_Store and *.xcuserstate always change and don\'t need to be commited. So, I wrote a .gitignore file that contains this:
.DS_Store
Try git update-index --assume-unchanged *.xcuserstate .DS_Store and see if it helps
git update-index --assume-unchanged *.xcuserstate .DS_Store