diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py index 30a1dad75b91796b834bda5527a5dbcc6cbd768f..4d930ef3bac48c54a0723c77cc11179df44c4714 100755 --- a/deploy_gitlab_ci.py +++ b/deploy_gitlab_ci.py @@ -104,7 +104,7 @@ def main(): common.wait_until_merge_status_is_set(project, mr) # Attempt to merge - merged = accept_merge_request(project, mr) + merged = accept_merge_request(project, mr, rebase=True) if not merged: sys.exit("Integration MR could not be merged")