Menu
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 (??)
859
Developers should evaluate if they actually made a change to a storyboard, and only include it in the commit if they did. If a merge conflict of this type is encountered, the simplest approach is to review the conflicts, and if they are minor layout adjustments, select the newest change to resolve the conflict.
Per Pierre Perrin: "The easiest way is to select your viewControllers, copy and paste in you main. storyboard." Regarding the swift files associated with the view controllers and whether or not you will need to update the class references in the identity inspector, "normally it will be done automatically.
Select the shake button. Hold the control and click-drag from the storyboard button into your view controller source file as if you were to create a IBOutlet. When prompted to name your IBOutlet, change the connection type from Outlet to Action using the dropdown menu.
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.
80
Our team has found the majority of Michael Behan's method to work well. ⌘Boom
43
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
