merge - XCode Storyboard merging

Question

Is there a way to merge XCode 4.2 Storyboard files?

I'm working with another developer on an iPhone project and all my attempts at merging changes into a storyboard file have met with failure and after which Xcode is no longer able to load the storyboard. Consequently I have to do an svn revert and then redo my modifications.

Answer 1

Here's the only tool I've ever come across which lets you merge storyboards:

https://github.com/marcinolawski/StoryboardMerge