From 722c9828a03d101186b74789e06c6ecba6c8809c Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Tue, 7 Dec 2021 09:27:24 +0100
Subject: [PATCH] trying to fix errors like

cannot lock ref 'refs/heads/master': is at 2d39da4d8d387b7dbb5b63fae67bff41a57543ce
but expected 596a8ecd119fded5604e02043bfabfa7bea0ccfe
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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