Geek asks and answers

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

Each time I try, there is a merge conflict with another member of my team. And I tried to manually delete ==== and → →, but Xcode will never open the file after that.

I'm just wondering, is this a problem that EVERY iOS person in a team faces? Is there any advice or trick to avoid this bullshit? This seriously slows down my performance by a huge amount.

+5
source share
2 answers

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

+2
source

these two can go a long way:

  • xcode, , , . : xcconfigs.

  • . , .

+1

More articles:


All Articles