Diffs for pbxproj files are also not especially readable, so just a merge tool wouldn't be enough to make collaboration easy. Here's a recent diff of adding so

Diffs for pbxproj files are also not especially readable, so just a merge tool wouldn't be enough to make collaboration easy. Here's a recent diff of adding some files: http://trac.webkit.org/changeset/138661/trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj http://trac.webkit.org/changeset/138661/trunk/Source/WebCore... and the equivalent change in Gyp: http://trac.webkit.org/changeset/138661/trunk/Source/WebCore/WebCore.gypi http://trac.webkit.org/changeset/138661/trunk/Source/WebCore...