trying to fix errors like

cannot lock ref 'refs/heads/master': is at 2d39da4d8d but expected 596a8ecd11
2021-12-07 09:27:24 +01:00 · 2021-12-07 09:27:24 +01:00 · 722c9828a0
parent 188c199863
commit 722c9828a0
1 changed files with 1 additions and 1 deletions
--- 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