From 4376719dc0b337f51aae6bf5dc23080955bd8db7 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Mon, 7 Oct 2019 12:36:50 +0100
Subject: [PATCH] CI: adjust auto merge strategy

---
 .ci/test_template.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/test_template.sh b/.ci/test_template.sh
index 6e42a7182..7880223dc 100644
--- a/.ci/test_template.sh
+++ b/.ci/test_template.sh
@@ -9,7 +9,7 @@ set -e
 # which gitlab CE does not currently do for us.
 if [[ "$CI_PROJECT_PATH" != "$UPSTREAM_PROJECT" ]]; then
   git fetch upstream;
-  git merge --no-commit --no-ff upstream/master;
+  git merge --no-commit --no-ff -s recursive -X ours upstream/master;
 fi;
 
 source /test.venv/bin/activate
-- 
GitLab