From de48d54201e66874e5b02a4b15eb270bb700d000 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Mon, 17 Apr 2017 05:50:41 +0200
Subject: [PATCH] conflict occured after manual merge+push to master

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e65d9df60..720b19460 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -432,7 +432,7 @@ mergeIntoMaster:
     - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV"
     - export UPDATEDREV=$(git describe)                                                             # tested state + 1 commit
     - git checkout master
-    - git merge $UPDATEDREV
+    - git merge $UPDATEDREV -s ours                                                                 # conflicts occur only for inconsistent state
     - git push origin master                                                                        # master is now tested version and has updated VERSION file
     - git checkout development
     - git pull