From 2b178685a05144128644cf18c1d7519dd355fcd8 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Sat, 30 Mar 2019 22:00:40 -0500
Subject: [PATCH] Safely handle not being able to push; if we've made it this
 far, it should pass anyway.

---
 templates/merger.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/merger.xml b/templates/merger.xml
index adfdc53..088a181 100644
--- a/templates/merger.xml
+++ b/templates/merger.xml
@@ -55,7 +55,7 @@ cd {{ NAME }}
 git checkout {{ DEFAULT_BRANCH }}
 git checkout -b {{ PACKAGING_BRANCH }} || git checkout {{ PACKAGING_BRANCH }}
 git merge --ff-only {{ DEFAULT_BRANCH }}
-git push --set-upstream origin {{ PACKAGING_BRANCH }}
+git push --set-upstream origin {{ PACKAGING_BRANCH }} || echo "cannot push"
       </command>
     </hudson.tasks.Shell>
   </builders>