From 80b843d0bf7d8a0a23862dc398fa8bf995d8bd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Thu, 9 Apr 2020 21:07:54 +0200
Subject: [PATCH] Reset to original master branch

In case the master branch had been checked out before
with a different commit from an earlier build, we
reset it to the commit from origin.
---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index a6ca00bb51..c910f01521 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,6 +53,7 @@ node('docker') {
 
           // merge release branch into master
           sh "git checkout master"
+          sh "git reset --hard origin/master"
           sh "git merge --ff-only ${env.BRANCH_NAME}"
 
           // set tag