While working on a project in git there was conflict in storyboard while I was trying to merge two branches. Is there any way to merge two conflicted storyboards using Git.
Asked
Active
Viewed 2,668 times
3
-
http://stackoverflow.com/questions/8393214/xcode-storyboard-merging – ZeMoon Feb 29 '16 at 06:34
-
1right click conflicted story board , Open as Source code , Remove conflicts as you remove in .m and .h files – MOHAMMAD ISHAQ Feb 29 '16 at 06:45
1 Answers
5
You can grab this tool and use it:
Read all about it, how to install and configure in the official project page:
https://github.com/marcinolawski/StoryboardMerge
CodeWizard
- 128,036
- 21
- 144
- 167