News for hackers. Stuff that matters.
Re:iOS Development Tips If You're Just starting Out by makmanalp on Wednesday January 16, 2013 @09:14AM (#5066826)
These used to be binary and so they'd not play well with version control. Is this fixed?
Re:iOS Development Tips If You're Just starting Out by reidmain on Wednesday January 16, 2013 @09:18AM (#5066841)
They are XML now but they are so volatile that merging is still a pain in the ass.
Re:iOS Development Tips If You're Just starting Out by e28eta on Wednesday January 16, 2013 @01:11PM (#5068141)
But storyboards read and merge very nicely, in my experience.

With two caveats: - the classes section will sometimes be removed by IB. Ignore it - the last section, inferred something (priority? segues? metrics?) with 5-6 entries, can cause the storyboard to be unopenable. So, when merging, if there are changes to that section in both versions, just delete the contents of the section.