Conflict free schema.rb

.git_slash_config

[merge "db_structure"]
  name = regenerate_db_structure
  driver = ./script/regenerate_structure && cp db/structure.sql %A

.gitattributes

db/structure.sql merge=db_structure

regenerate_structure.sql

#!/usr/bin/env bash

# Development DB often has useful data, use test env.
# db:setup uses existing structure file, so use db:migrate instead.
# I use structure.sql, if you're using schema.rb you want db:schema:dump instead of db:structure:dump

./bin/rake db:drop db:create db:migrate db:structure:dump RAILS_ENV=test