有没有一个很好的方法来使用git重新定义和合并project.pbxproj文件？

Question

I have a very annoying issue when rebase the xcodeproj files, is there any way to solve this?

The situation is like this:

(1) A changed the project.pbxproj of demo.xcodeproj, and commit 1;

(2) B changed the project.pbxproj of demo.xcodeproj, and commit 2;

(3)when B rebase the commit 2 to commit 1 , there gonna be lots of conflicts, and it's impossible to merge.

(4) So B have to commit again.

I know the project.pbxproj is an xml file, and the keys in xml are generated randomly.

My question is :

Is there any way to solve this problem? I have no clue about this.

Answer 1

It seems that in fact demo.xcodeproj is a folder , and like every system-dependant configuration file/folder, people tend to avoid versioning them, because they always create conflicts when updating.

Anyway, this question has already been addressed here: xcodeproj under version control