CODEWITHSUNDEEP
xcodegitcocoapods
wcochran
wcochran

Reputation: 10896

How to convert Xcode project into workspace and avoid git merge conflicts

Currently I am working on a team project with Xcode that is stored in Foo.xcodeproj. We all work on our own branches and do git pull requests for merging into the common dev branch. I am at a point where I want to use CocoaPods and once I do a pod install then the workspace Foo.xcworkspace will be created. The CocoaPod docs say:

Make sure to always open the Xcode workspace instead of 
the project file when building your project

On my branch I will have a workspace file whereas everyone else will be still working directly with the project file. I am trying to be preemptive and avoid difficult git merge conflicts. Will it matter if my teammates are still opening the project file or are we going to have merge conflict hell?

Upvotes: 0

Views: 1617

Answers (1)

Joe
Joe

Reputation: 4074

Being a one team you all should work in one either in Project or Workspace, are you the only one using cocoapods no one else in Team wants to get the functionalities available through Pods. If you are the only one continuing with PODS be careful while committing the project file in git.

Answer to your question, just commit your Podfile, podfile.lock and .xcworkspace file in git and whenever the other teammate is getting the pull ask him to do a pod install and then open the .xcworkspace file to work as you did initially.

Upvotes: 1

Related Questions