*.rb diff=ruby
db/schema.rb merge=railsschema
Gemfile.lock merge=gemfilelock