From 9f8b0d2cac5337339d0b509032508a9a0bfdedfe Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Tue, 15 Jan 2019 00:14:16 +0100
Subject: [PATCH] even harder
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41f627d9..1505ca08 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"
--
GitLab