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

deploy_gitlab_ci: automatically rebase if merge fails

parent adbeb1d7
No related branches found
No related tags found
1 merge request!45deploy_gitlab_ci: automatically rebase if merge fails
Pipeline #8295 passed with stages
in 2 minutes and 37 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
deploy_gitlab_ci.py
+ 1
− 1
View file @ 1fe2486a
...@@ -104,7 +104,7 @@ def main(): ...@@ -104,7 +104,7 @@ def main():
common.wait_until_merge_status_is_set(project, mr) common.wait_until_merge_status_is_set(project, mr)
# Attempt to merge # Attempt to merge
merged = accept_merge_request(project, mr) 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")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment