Best way to manage storyboards under git?

Question

I have a project that my developers are working on, and the tasks are divided so that one person executes most of the business logic, and two developers make an interface divided into tasks.

Now we have a problem that 2 interface developers have conflicts on their storyboards. Most problems occur when one developer fixes the problem and decides to fix it everywhere by going to other view controllers. In addition, storyboards generally cause frames to be updated, which are updated slightly, and looks are suddenly lost.

We have a code check, so front-end developers check each other's code, so this creates another problem, which is the delay between the transfer request and its merging into master. Thus, the thing he was working on cannot be reused again for a new task (because new task = new branch).

Is there a better way to work with junk files and git?

Answer 1

You should look for links to the Storyboard - this will reduce your conflicts.

But you cannot have two people working on the same storyboard without conflict (sometimes it can get away with you)

IOS 8+ compatible

https://developer.apple.com/videos/wwdc/2015/?id=215

---

http://useyourloaf.com/blog/refactoring-with-storyboard-references.html

. , Interface Builder . instantiateViewControllerWithIdentifier:, .

, Xcode 7, - Interface Builder.

, Storyboard, iPhone .

"" - . "" segues .

iPad , popover, . iPad Storyboard, :

• - , .

• "" "Refactor to Storyboard", ( "" ) .

• Builder , .

• , , , :

, . , ( ). .

Strawboard, Storyboard iPad:

, :

, , . , , popper segue " ":

Storyboard , . , Interface Builder , . , Xcode 8?

, , , , . Xcode .

27 2015 .: , iOS 8, segue. , iOS 8.