Managing conflict in schema.rb created by Git operation

When I find myself with this conflict, I simply migrate the database. Whether there are pending migrations or not, the conflict will be corrected.

If your current database has the correct schema, you should:

• Run pending migrations (if any)

  rake db:migrate
  

• Overwrite your schema.rb from your current database schema

  rake db:schema:dump
  

• And commit