merge_db_schema

https://github.com/pocke/merge_db_schema

It is a git merge driver for db/schema.rb of Ruby on Rails. It resolves some of the conflict automatically.