From 09165b464a6b5dddad53d58370a26acb166d5dfa Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 30 Oct 2018 14:28:35 +0100
Subject: 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.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.1