title: How can I sanely approach version control and Core Data models?
body: <p>When we put Core Data model files under version control with git, we always have a horrible time merging changes - the only sure fire way we've found to avoid having to merge in changes by hand is to communicate among the team to block off access to the model while one person makes their necessary changes and pushes, then the next person, etc.
  Surely there is a better way to handle this, but as a git novice no obvious solution comes to mind.
  Any suggestions?</p>