How can I sanely approach version control and Core Data models?

Question

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 i

Answer 1

As soon as you start maintaining migration mapping models, at least you can compare data models and have a look at the changes. The same compare functionality would also be great within SCM revisions of data models and would make life a lot easier.