Tuesday August 21, 2012

Avoiding Merge Conflicts With Storyboards

Merge conflicts. Say that to anyone who’s had to merge xib files and they shudder. Raise your hand if you’ve had to implement some kind of manual semaphore to keep your team members from altering the same xib file as you work in a different branch.

Storyboards are easier to merge than their xib counterparts due to human friendly identifiers inside, but by default you have a bundle of all the interface screens in a single XML document. Bleh.

The good news is that you don’t have to use a single storyboard. That’s where Mugunth Kumar’s great post about managing multiple storyboards can help.

Now, if only we could have some better merge handling for Xcode project files…