rails-schema-merge-driver 0.1.0
A custom git merge driver that auto-resolves the most common conflict in Rails schema files (db/schema.rb and, with the data_migrate gem, db/data_schema.rb): the define(version: N) line that gets bumped on every migration. Keeps the higher version on conflict and falls back to a normal merge conflict for any other diverging content. Adapted from tpope's gist (https://gist.github.com/tpope/643979) and extracted from the Librario application (https://www.librario.de).
Gemfile:
=
install:
=
Requirements:
git