The storyboard was great for initial development to grant a snapshot of the application. It is a nightmare when it comes to merging with another developer.
I would prefer to manage the view controllers in individual files and manage the transitions to reduce the complexity of the merging on the storyboard.