CODEWITHSUNDEEP
xcodegit
Igor
Igor

Reputation: 6245

Xcode project files in version control

Trying to pull latest I received following message:

Igors-MacBook-Air:dbhandler igorkorot$ git pull
warning: redirecting to https://github.com/oneeyeman1/dbhandler.git/
warning: Cannot merge binary files: dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. 99e3237b1e5ece37e624a4ca1c78d739c97e79df)
Auto-merging dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.

Is this file needs to be in VC? My initial thought was to put everything in VC but turns out Xcode project files contains binary files as well. And I'm not well versed with Xcode internals.

Upvotes: 1

Views: 428

Answers (1)

VonC
VonC

Reputation: 1323045

Check if adding binary merge to a xcuserstate file would help:

echo '*.xcuserstate  binary merge' >> .gitattributes
  • binary would keep the implied -text (remove crlf) and -diff (no diff),
  • but merge would allow the file to be merged.

See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.

However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).

Upvotes: 1

Related Questions