Merge branch 'hotfix/fixCiVersioningProblem' into release

Author: Johannes Weiß

scripts/ci/building/push_new_versionnumber.sh

@@ -59,12 +59,12 @@ else
 
       echo "merge version update commit from release to develop branch and push that"
       echo "########################################'"
-      echo "git checkout -b develop --track ${remote}/develop"
-      git checkout -b develop --track ${remote}/develop
+      echo "git checkout develop"
+      git checkout develop
       echo "git merge release"
       git merge release
-      echo "git pull --rebase $remote develop"
-      git pull --rebase $remote develop
+      echo "git pull $remote develop"
+      git pull $remote develop
       echo "git push $remote HEAD:refs/heads/develop"
       git push $remote HEAD:refs/heads/develop