Improve error messages

scripts/deploy_gitlab_ci.py

@@ -279,11 +279,11 @@ def main():
 
             if not 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."
+                    "Integration MR could not be merged:\n"
+                    "%s\n"
+                    "This can probably be resolved by creating a new commit in "
+                    "gitlab-ci and merging it. The above MR can be closed then."
+                    % mr.web_url
                 )
 
     # =======================================================
@@ -406,11 +406,11 @@ def main():
 
         if not 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."
+                "Integration MR could not be merged:\n"
+                "%s\n"
+                "This can probably be resolved by creating a new commit in "
+                "gitlab-ci and merging it. The above MR can be closed then."
+                % mr.web_url
             )
 
         print("Successfully merged")