working with Xcode and version control tool

Question

I'm currently working with a few other developers under Xcode environment that is stored in common remote git repository.

Unlike other project editors such as SlickEditor, Xcode is a full development environment, so the project files should also be kept version control, since they bind the compiling information inside (on other cases, we have the compilation info stored in Makefiles, separated from project structure info that can be kept local.)

The problem arise when merges are needed in the project files. since this files are auto generated and can be modified properly only through Xcode UI, it require manual addition rather then merge (simply add the modification of the project files from the source merge, manually from Xcode UI in target).

my question is whether this approach is inevitable, and if there are more efficient, easier ways to do it ?

Answer 1

The problem arise when merges are needed in the project files. since this files are auto generated and can be modified properly only through Xcode UI

I would advise you not to store auto generated files under version control with Git, or any other VCS. You should only be versioning your source code.