iOS - best practice for managing code merge in a storyboard

ios xcode storyboard uistoryboard git-merge
j2emanue picture j2emanue · Mar 25, 2015 · Viewed 18.7k times · Source

Merging in a xcode storyboard with many team members can produce many conflicts etc. I need a strategy to share a storyboard with 20 team members but to avoid the nightmares associated with merging code in a storyboard.

I thought of having a separate target per team in xcode but this doesn't do well as we all need the updates so having two story boards is not good practice.

my code base is inherited. its a forked project that is storyboard heavy already. I think changing to xib might be difficult (??)

Answer

Anish Parajuli 웃 picture Anish Parajuli 웃 · Mar 25, 2015

Check out this tutorial which clearly suggests not using a storyboard while working on team.

But you can divide team into each module and use some versioning system as bitbucket or git to manage your code with the help of multiple storyboards(separate storyboard for separate module).

Careful day by day commit and pull will definitely resolve conflicts.

Related questions

Passing object with prepareForSegue Swift

I am trying to pass an object to another scene with prepareForSegue() override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { // Get the new view controller using [segue destinationViewController]. var nextScene = segue.destinationViewController as! VehicleDetailsTableViewController // Pass the selected object to the new …

Read More
How can I change the global tint color programmatically?

My project needs to switch between 2 different global tint values. How can I do this programmatically?

Read More
How to pass prepareForSegue: an object

I have many annotations in a mapview (with rightCalloutAccessory buttons). The button will perform a segue from this mapview to a tableview. I want to pass the tableview a different object (that holds data) depending on which callout button was …

Read More