From 4da2420152394f23575a23e4be1e4178b55978a0 Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Thu, 6 Mar 2025 13:47:31 +0200 Subject: [PATCH] Use merge, not rebase when running check runs --- webhook_server_container/libs/github_api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index 97bc4a70..bd42c75b 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -1692,7 +1692,8 @@ def _prepare_cloned_repo_dir( if getattr(self, "pull_request", None): rc, out, err = run_command( - f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix + f"{git_cmd} merge {self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", + log_prefix=self.log_prefix, ) if not rc: yield rc, out, err @@ -1723,7 +1724,8 @@ def _prepare_cloned_repo_dir( if getattr(self, "pull_request", None): rc, out, err = run_command( - f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix + f"{git_cmd} merge {self.pull_request_branch} -m 'Merge {self.pull_request_branch}'", + log_prefix=self.log_prefix, ) if not rc: yield rc, out, err