4

My team develops iOS apps. We are considering using Storyboards with our next project, however, we are bit concerned with the merging conflicts that we will be inevitably be dealing with in GIT (or any other source control) and the auto-generated xml data behind the scenes in storyboards.

How are people handling this scenario, or can someone provide us some recommendations on how to make this work with less pain?

Adam Johnson
  • 2,198
  • 1
  • 17
  • 23
  • Would love to hear an answer to this as well as I'm dealing with this right now and it is a major pain. – mwright Aug 09 '12 at 04:20
  • @mwright does [this](http://stackoverflow.com/questions/1681762/how-to-handle-xml-html-in-git-feature-branch-workflow) answer the question? – loopbackbee Jan 14 '13 at 04:24

1 Answers1

0

We've handled this by adding a .gitattributes file in the root of the project with the following in it:

*.pbxproj binary merge=union

I'm sure there are better ways as suggested, but this did the trick in a pinch.

Community
  • 1
  • 1
typeoneerror
  • 55,990
  • 32
  • 132
  • 223