[rcirka]

The solution I use is to not use storyboards. Although storyboards have some nice features, they don't work well in large projects. Merge commits are the big problem. The storyboard diagram can get huge. Also, storyboards don't handle the re-use of view controllers very well. My teams stick with using the traditional viewcontroller per nib model. I have read that some companies, such as google, forbid the use of nibs altogether.