Here’s the ProGit book topic: http://progit.org/book/ch7-2.html
About what I said - first two attributes say treat the file as a binary, in GIT 1.6 there’s -binary flag that means the same, the third flag says leave it out of merges. The file is the actual xcode project info in the bundle, as opposed to a single users stuff.
I also wanted to add apps, so they don’t get mangled. I’m trying with .app and the same flags, but if it knows that it’s a bundle that probably won’t work. Best, as the sample does, to ignore the whole build folder?
I also added to #xcode noise:
and to #osx noise
I’m not certain though - maybe you need to commit those two files so we get them when we check out the repo? Maybe that’s why it’s not working well - you have some stuff locally but we don’t. Bear in mind, you also make all the xcode project changes, rarely pull them (I’d think). We have to pull yours, and that’s a lot of the shennanigans.