Xcode Project file git merge conflict

Question

In Xcode, what\'s the best way to avoid Git conflict in the project file? (I am in manual git, not using Xcode interface for git)

I\'ve cloned mapbox-ios-sdk from Github

Answer 1

You can also use Mergepbx manually do it as follows

1. Install Mergepbx using brew.

   brew install mergepbx

2. Run a command each time you have conflicts in your project file to automatically resolve them.

   git mergetool --tool=mergepbx PROJECT.pbxproj