CODEWITHSUNDEEP
iosxcodeversion-control
patrick
patrick

Reputation: 9742

How to handle merge conflicts in Xcode "pbxproj" file?

Everytime I do a pull, there is a merge conflict from my other team member.. And I've tried to manually remove the ==== and >>>>'s but Xcode will never open the file after this.

I am just curious, is this a problem that EVERY iOS person on a team deals with? Is there any sort of tip or trick to avoid this nonsense? It's seriously slowing down my productivity by a huge amount.

Upvotes: 6

Views: 2747

Answers (3)

Alan Li
Alan Li

Reputation: 1

I ran into a merge conflict that had to do with our team's cocoapods integration. After running pod deintegrate and then pod install again the .pbxproj file was parsable again.

Upvotes: 0

justin
justin

Reputation: 104698

these two can go a long way:

  • rely on the xcode project less, such that you could reconstruct a project by adding a directory of stuff, then get it to build with minimal changes. a good example of this: define your build settings in xcconfigs.

  • simplify your projects. collisions will be reduced if you are developing separate components of the same larger project.

Upvotes: 1

borrrden
borrrden

Reputation: 33421

You just need a good merge tool. I use p4merge: http://www.andymcintosh.com/?p=33 contains a guide to integrating it with Git.

Upvotes: 3

Related Questions