Skip to content

Instantly share code, notes, and snippets.

@rahim
Forked from strax/.gitattributes
Created March 19, 2018 16:07
Show Gist options
  • Save rahim/ac4eb62bfbf7f05d996c09d2cd88d336 to your computer and use it in GitHub Desktop.
Save rahim/ac4eb62bfbf7f05d996c09d2cd88d336 to your computer and use it in GitHub Desktop.
Auto-resolving schema.rb version conflicts on Rails 4.0+
db/schema.rb merge=railsschema
[merge "railsschema"]
name = newer Rails schema version
driver = "ruby -e '\n\
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
b = File.read(%(%A))\n\
b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.version: (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.version: (\\d+). do\\n>+ .*/) do\n\
%(ActiveRecord::Schema.define(version: #{[$1, $2].max}) do)\n\
end\n\
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
exit 1 if b.include?(%(<)*%L)'"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment