diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41f627d9332d2aca8f7a362876d62e52459c46ff..1505ca08e796a01b68353d6e335f8bfb7566bef2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,7 @@ merge into local: only: - master@solidstate/lectures script: - - git fetch origin + - git checkout master; git reset --hard origin/master - git checkout local; git reset --hard origin/local - git diff-index --quiet master || git -c "user.name=$GITLAB_USER_NAME" -c "user.email=$GITLAB_USER_EMAIL" merge master - "git push https://$GITLAB_PUSH_KEY@gitlab.kwant-project.org/solidstate/lectures.git local"