Seems good :+1:

Resolving the conflict with git is probably the easy part.

For me, resolving "conflicts" usually mean recreating the database :smile: This happens when me and my coworkers each added a table or a column in a branch (for example), so they appear in different orders in our local databases. What would end up happening is that from now on everytime you run a migration, one of us would generate a new `schema.rb` with those ordered flipped back.

You can checkout the file again from master, but it gets pretty annoying. So eventually one of us would have to manually reorder things in the DB to match the checked-in `schema.rb`, or recreate the DB from scratch based on the checked-in `schema.rb`, or rollback a few migrations and replay them..

I would love to know if there's a better way to do that :smile: