From cc47c980a7d8e60a22ab9bf32c72ada10609cd43 Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Tue, 25 Dec 2018 01:49:53 +0100
Subject: [PATCH] automatically merge master into local on updates

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60efabae..6a09866e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,3 +76,11 @@ undeploy test version:
   environment:
     name: $CI_COMMIT_REF_NAME
     action: stop
+
+merge into local:
+  only:
+    - master@solidstate/lectures
+  script:
+    - git checkout local
+    - git merge master
+    - git push https://$GITLAB_PUSH_KEY@gitlab.kwant-project.org/solidstate/lectures.git local
-- 
GitLab