Should I merge .pbxproj files with git using merge=union?

Question

I\'m wondering whether the merge=union option in .gitattributes makes sense for .pbxproj files.

The manpage states for this option:

Run 3-way

Answer 1

I have been working with a large team lately and tried *.pbxproj merge=union, but ultimately had to remove it.

The problem was that braces would become out of place on a regular basis, which made the files unreadable. It is true that tho does work most of the time - but fails maybe 1 out of 4 times.

We are back to using *.pbxproj -crlf -merge for now. This seems to be the best solution that is workable for us.