diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7858a6cfd03904acfd3fc5eb788ef685826fdda..60fb83e79cce74a22f830d8b2c03fff8d5d7204f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,7 @@ commits: - git remote set-url origin $PRIVATE_REPOSITORY_URL_SSH - git config --global user.email "$CI_EMAIL" && git config --global user.name "$CI_USER" - 'exists=`git show-ref refs/heads/$CI_COMMIT_REF_NAME` && if [ -n "$exists" ]; then git branch -D $CI_COMMIT_REF_NAME; fi' + - 'if [ -d ".git/rebase-apply" ]; then rm -fr .git/rebase-apply; fi' - git pull --rebase origin $CI_COMMIT_REF_NAME - git checkout -b $CI_COMMIT_REF_NAME - git push origin --all