.pbxproj Merge Hell
A friend of mine sent me Behind enemy lines: 3 months as an iOS developer at Google. The article is very interesting, but here's the thing which caught our attention: The way Google deals with merge conflicts in
.pbxproj files are created using GYP from a specification designed to be human-readable and mergable.
Neat! That's the kind of thing I find useful for working around Xcode.