Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

XCode Storyboard merging

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.

like image 961
sipsorcery Avatar asked Dec 05 '11 23:12

sipsorcery


People also ask

How do I merge two storyboards in Xcode?

Per Pierre Perrin: "The easiest way is to select your viewControllers, copy and paste in you main. storyboard." Regarding the swift files associated with the view controllers and whether or not you will need to update the class references in the identity inspector, "normally it will be done automatically.

How do you resolve a merge conflict in a storyboard?

Developers should evaluate if they actually made a change to a storyboard, and only include it in the commit if they did. If a merge conflict of this type is encountered, the simplest approach is to review the conflicts, and if they are minor layout adjustments, select the newest change to resolve the conflict.

Can you have multiple storyboards Xcode?

Apple introduced them in iOS 9 and macOS 10.11. They do exactly what I needed. They allow you to break a storyboard up into multiple, smaller storyboards. A storyboard reference ties multiple storyboards together, creating one, large, composite storyboard.


1 Answers

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

https://github.com/marcinolawski/StoryboardMerge

like image 133
Adam Avatar answered Oct 02 '22 18:10

Adam