Similar for the most part, what do you guys think?
I feel like there's got to be a better way to merge Xcode project files. Keeping both sides of the conflict blows up often enough that I usually resolve any conflicts manually in my text editor, so I'm hesitant to add a .gitattributes file.