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.
This commit is contained in:
Yorick Peterse 2018-10-30 14:28:35 +01:00
parent 43463869c8
commit 09165b464a
No known key found for this signature in database
GPG Key ID: EDD30D2BEB691AC9
1 changed files with 1 additions and 0 deletions

1
.gitattributes vendored
View File

@ -1 +1,2 @@
Dangerfile gitlab-language=ruby
db/schema.rb merge=merge_db_schema