add merging of local tmp branch

.gitlab-ci.yml

@@ -25,12 +25,14 @@ commit:
     - if: $CI_MERGE_REQUEST_ID
   before_script:
     - url_host=`git remote get-url origin | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
-    - git branch -d $CI_COMMIT_BRANCH # delete existing branch locally
-    - git checkout -b $CI_COMMIT_BRANCH origin/$CI_COMMIT_BRANCH
+    - git checkout -b tmpBranch origin/$CI_COMMIT_BRANCH
     - git remote set-url origin "https://$GIT_ACCESS_USER:$GIT_ACCESS_TOKEN@${url_host}"
     - git config user.name $GIT_ACCESS_USER
     - git config user.email $GIT_ACCESS_EMAIL
   script:
     - git add --all
     - git commit -m "Update models"
-    - git push origin $CI_COMMIT_BRANCH
\ No newline at end of file
+    - git checkout $CI_COMMIT_BRANCH
+    - git merge tmpBranch --ff
+    - git push origin $CI_COMMIT_BRANCH
+    - git branch -D tmpBranch
\ No newline at end of file