CODEWITHSUNDEEP
iosxcodestoryboarduistoryboardgit-merge
j2emanue
j2emanue

Reputation: 62519

iOS - best practice for managing code merge in a storyboard

Merging in a xcode storyboard with many team members can produce many conflicts etc. I need a strategy to share a storyboard with 20 team members but to avoid the nightmares associated with merging code in a storyboard.

I thought of having a separate target per team in xcode but this doesn't do well as we all need the updates so having two story boards is not good practice.

my code base is inherited. its a forked project that is storyboard heavy already. I think changing to xib might be difficult (??)

Upvotes: 31

Views: 21043

Answers (3)

Eray Alparslan
Eray Alparslan

Reputation: 814

I want to add that sometimes the xml file of the storyboard can change its content even though you just open the Interface Builder, or move the page in workspace.

That's why, it's so much better to not commit those changes.

Upvotes: 0

LC 웃
LC 웃

Reputation: 18998

Check out this tutorial which clearly suggests not using a storyboard while working on team.

But you can divide team into each module and use some versioning system as bitbucket or git to manage your code with the help of multiple storyboards(separate storyboard for separate module).

Careful day by day commit and pull will definitely resolve conflicts.

Upvotes: 8

Justin Vallely
Justin Vallely

Reputation: 6089

Our team has found the majority of Michael Behan's method to work well. ⌘Boom

  • Everyone on the same build of Xcode
  • Multiple storyboards
  • Use Nibs for custom views
  • Think about which storyboards are involved when assigning tasks
  • Merge storyboards often

Upvotes: 7

Related Questions