Skip to content
Snippets Groups Projects
Commit a497a570 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

deploy_gitlab_ci: show instructions if merge fails

parent 01d10fab
No related branches found
No related tags found
1 merge request!53deploy_gitlab_ci: show instructions if merge fails
Pipeline #8348 passed with warnings with stages
in 17 minutes
...@@ -107,7 +107,13 @@ def main(): ...@@ -107,7 +107,13 @@ def main():
merged = accept_merge_request(project, mr, rebase=True) merged = accept_merge_request(project, mr, rebase=True)
if not merged: 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") print("Successfully merged")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment