pull needed to avoid conflicts

2017-04-14 09:16:21 +02:00 · 2017-04-14 09:16:21 +02:00 · a46107ba7f
parent 4ffca8f0dc
commit a46107ba7f
1 changed files with 1 additions and 0 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -435,6 +435,7 @@ mergeIntoMaster:
    - git merge $UPDATEDREV
    - git push origin master                                                                        # master is now tested version and has updated VERSION file
    - git checkout development
+    - git pull
    - git merge master -s ours                                                                      # only possible conflict is in VERSION file
    - git push origin development                                                                   # development is unchanged (as master is based on it) but has updated VERSION file
  only: