From a497a5705c4cbfa2a03f5241fc79bc3c9f7869da Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Tue, 29 Jun 2021 19:42:57 +0200
Subject: [PATCH] deploy_gitlab_ci: show instructions if merge fails
---
deploy_gitlab_ci.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py
index 4d930ef3..ec5bb677 100755
--- a/deploy_gitlab_ci.py
+++ b/deploy_gitlab_ci.py
@@ -107,7 +107,13 @@ def main():
merged = accept_merge_request(project, mr, rebase=True)
if not merged:
- sys.exit("Integration MR could not be merged")
+ sys.exit(
+ "Integration MR could not be merged. You have two possibilities to fix "
+ "this:\n"
+ " 1. Checkout the MR and rebase it on the current master manually, or\n"
+ " 2. Delete the MR (Edit -> Delete in the MR UI)\n"
+ "In either case restart this job afterwards in order to get it merged."
+ )
print("Successfully merged")
--
GitLab