I just tried to checkout my master branch and ran into:
error: Untracked working tree file \'app.xcodeproj/project.xcworkspace/xcuserdata/u.xcuserdatad/UserI
simple:
git add file.ext git rm --cached file.ext
or
git add path/* git rm --cached path/*