CODEWITHSUNDEEP
xcodegit
lijinma
lijinma

Reputation: 2942

Is there a good way to rebase and merge the project.pbxproj file using git?

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.

Upvotes: 3

Views: 2240

Answers (1)

Bastien Jansen
Bastien Jansen

Reputation: 8846

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

Upvotes: 1

Related Questions