gitlab-org--gitlab-foss/.gitattributes
Yorick Peterse 09165b464a
Use merge_db_schema for db/schema.rb conflicts
This Gem can be used to automatically resolve merge conflicts in
db/schema.rb. To use it you still need to initialise the configuration,
which can be done by running:

    merge_db_schema-init --force

See https://gitlab.com/gitlab-org/release/framework/issues/42 for more
information.
2018-11-01 14:15:55 +01:00

2 lines
67 B
Text

Dangerfile gitlab-language=ruby
db/schema.rb merge=merge_db_schema