From 7731b14fffc86bcf4f2cd053a0027eff02ab9614 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 28 Aug 2013 14:02:05 +0200
Subject: [PATCH] fix build failure after merge to integration branch

---
 maven_post_build_debian_wrapper.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maven_post_build_debian_wrapper.sh b/maven_post_build_debian_wrapper.sh
index 39364ad..c367638 100755
--- a/maven_post_build_debian_wrapper.sh
+++ b/maven_post_build_debian_wrapper.sh
@@ -137,6 +137,8 @@ if [[ ${GIT_BRANCH_NAME:0:8} = "feature/" ]] || [[ ${GIT_BRANCH_NAME:0:7} = "bug
         if [[ "$BUILD_TRIGGERS" = *"merge"* ]]; then
         git push origin integration
         figlet "Pushed to integration."
+        # restore branch we were building from:
+        git branch -D $GIT_BRANCH_NAME
         git checkout origin/$GIT_BRANCH_NAME -b $GIT_BRANCH_NAME
     fi
 fi
-- 
2.39.5