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?

Improve this question
2
  • Would love to hear an answer to this as well as I'm dealing with this right now and it is a major pain. Commented Aug 9, 2012 at 4:20
  • @mwright does this answer the question? Commented Jan 14, 2013 at 4:24

1 Answer 1

Reset to default
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.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.