[katello-devel] Fixing schema.rb merge conflicts

[David Davis]

If you ever get a merge conflict in your schema.rb file, the solution is very easy. Just run "rake db:migrate" to regenerate it. After that, you can just run git commit or git rebase --continue.

As to why our schema.rb is in version control now, it's recommended in Rails as it's considered to be the authoritative source for what the db ought to look like [1]. Moreover, Travis is using it to load the database as it's about 50 seconds faster than migrating.

[1] http://guides.rubyonrails.org/migrations.html#schema-dumping-and-you

David