Avoid merge conflicts into project.pbxproj

mergeunion.md

1. Create a .gitattributes file:

Assuming you don’t already have one, create a file called .gitattributes in your project’s root directory.

2. Set the merge strategy to union:

Add the following line to your .gitattributes file.

This will tell git to merge using the union strategy, meaning it’ll keep both sides (theirs and ours).

*.pbxproj merge=union

As an alternative:

Check this library, this allows you to add a similar attribute.

*.pbxproj merge=mergepbx

3. Add it to your project:

git add .gitattributes

Reference:

https://roadfiresoftware.com/2015/09/automatically-resolving-git-merge-conflicts-in-xcodes-project-pbxproj/