iOS - best practice for managing code merge in a storyboard
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.
Our team has found the majority of Michael Behan's method to work well. ⌘Boom
- Everyone on the same build of Xcode
- Multiple storyboards
- Use Nibs for custom views
- Think about which storyboards are involved when assigning tasks
- Merge storyboards often