try harder when merging

.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"