From f4816ebe877839cb10833ab55ebea4d5231c58bf Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Wed, 5 Mar 2025 13:46:37 +0200 Subject: [PATCH 1/2] feat: rebase pull request branch on checkout PR --- webhook_server_container/libs/github_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index 280935b3..8ef81c81 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -1642,6 +1642,7 @@ def _prepare_cloned_repo_dir( # Checkout to requested branch/tag if checkout: run_command(f"{git_cmd} checkout {checkout}", log_prefix=self.log_prefix) + run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix) # Checkout the branch if pull request is merged or for release else: From 774ded6014628bd2cf52d2bb82d0da0b6b237cbd Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Wed, 5 Mar 2025 14:01:41 +0200 Subject: [PATCH 2/2] feat: rebase pull request branch on checkout PR --- webhook_server_container/libs/github_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/webhook_server_container/libs/github_api.py b/webhook_server_container/libs/github_api.py index 8ef81c81..4d1b05a7 100644 --- a/webhook_server_container/libs/github_api.py +++ b/webhook_server_container/libs/github_api.py @@ -1663,6 +1663,7 @@ def _prepare_cloned_repo_dir( run_command( command=f"{git_cmd} checkout origin/pr/{pull_request.number}", log_prefix=self.log_prefix ) + run_command(f"{git_cmd} rebase {self.pull_request_branch}", log_prefix=self.log_prefix) yield