CODEWITHSUNDEEP
xcodegitmerge
huggie
huggie

Reputation: 18237

Tell git to treat pbxproj as text

I'm using Mapbox-ios-sdk and try to merge difference from the source in Github to my local hack.

Now I'm trying to tell Git to treat pbxproj file as text by writing 

*.pbxproj text -crlf -diff -merge union

to a new file ./git/info/attributes

On git diff MapView/MapView.xcodeproj/project.pbxproj it still treats it as binary:

diff --git a/MapView/MapView.xcodeproj/project.pbxproj b/MapView/MapView.xcodeproj/project.pbxproj
index d91c5b9..d8d04df 100755
Binary files a/MapView/MapView.xcodeproj/project.pbxproj and b/MapView/MapView.xcodeproj/project.pbxproj differ

I've also tried to write it as .gitattributes but it still treat the file as binary. Why is that?

Upvotes: 2

Views: 1498

Answers (1)

VonC
VonC

Reputation: 1324178

From the man gitattributes man page, -crlf and -diff seem to be associated with a way to make a file as binary.

So this should be closer to the mark (a bit like in this config):

*.pbxproj text -merge union

Upvotes: 1

Related Questions