Git and pbxproj
The pbxproj file isn’t really human mergable. While it is plain ASCII text, it’s a form of JSON. Essentially you want to treat it as a binary file. Here’s what the individual flags do: -crlf: don’t use crlf <=> cr conversion -diff: do not diff the file -merge: do not attempt to merge the file … Read more