From 26cb1daa1caa60b3e3b156aabfcdd39d7ab1d460 Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Tue, 15 Jan 2019 00:07:59 +0100
Subject: [PATCH] try harder when merging
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a7d393..41f627d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,6 +82,7 @@ merge into local:
only:
- master@solidstate/lectures
script:
- - git checkout local
+ - git fetch origin
+ - 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