title: Core data and version control
body: <p>I have a Core Data model that will be getting two new model versions in two separate branches.</p>
  
  <ul>
  <li><p>Will merging the two branches work properly (<code>xcdatamodel</code> seems to be an XML file)? That is, will it create the two new versions?</p></li>
  <li><p>What about versioning after merge: how would I create a new model version that contains the changes from both versions?</p></li>
  </ul>