diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 756237b3f..8ceb7575a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,7 +208,7 @@ update_revision: - git checkout master - git pull - git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state - - git push origin master # master is now tested version and has updated VERSION file + - git push - git checkout development - git pull - git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file