conflict occured after manual merge+push to master

2017-04-17 05:50:41 +02:00 · 2017-04-17 05:50:41 +02:00 · de48d54201
parent 1344905c7e
commit de48d54201
1 changed files with 1 additions and 1 deletions
--- 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