From 1fe2486a95a7a36b8446a1fac5eff308c97079db Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Tue, 29 Jun 2021 14:57:13 +0200
Subject: [PATCH] deploy_gitlab_ci: automatically rebase if merge fails
---
deploy_gitlab_ci.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py
index 30a1dad7..4d930ef3 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")
--
GitLab