summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-10-30 14:28:35 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2018-11-01 14:15:55 +0100
commit09165b464a6b5dddad53d58370a26acb166d5dfa (patch)
tree5d55c2cc6b615009349a85c6d973ea5d4532cbeb /.gitattributes
parent43463869c883c7972ecc03500ab35325eede7a01 (diff)
downloadgitlab-ce-09165b464a6b5dddad53d58370a26acb166d5dfa.tar.gz
Use merge_db_schema for db/schema.rb conflictsdb-schema-merge-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.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index f1c41c9bb76..7282c9e61b1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
Dangerfile gitlab-language=ruby
+db/schema.rb merge=merge_db_schema