seganw

I did not use this before, but how Git would treat if people commit in the same files(PBXFileReference) but with different UUIDs?

xUnique makes these UUIDS unique for everyone in the project. So there should be no conflicts theoretically.

Sorry, @ef4, my English is not very good, I do not quite understand "You could eliminate all the file references if you simply codified some conventions on project directory structure", could you please explain a little bit?

I think the merge conflicts are all due to Xcode not using real directories on disk, which means it has to maintain the directory structures in project file.

Yep, Apple should have take out more brilliant idea to solve it thoroughly. At present, I think my solution is the best one;)