From 8efdf6c3ec4da2d6c65e08cae6b3363ffbe42a12 Mon Sep 17 00:00:00 2001 From: Yaron Kaikov Date: Wed, 10 Dec 2025 13:55:54 +0200 Subject: [PATCH] auto-backport.py: modify instruction for making PR ready for review Update the comment sent when PR has conflicts with clear instrauctions how to make the PR Ready for review Fixes: https://scylladb.atlassian.net/browse/RELENG-152 Closes scylladb/scylladb#27547 (cherry picked from commit d3e199984efd2fd429a1f52e903748167b67ce42) Closes scylladb/scylladb#27564 --- .github/scripts/auto-backport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/auto-backport.py b/.github/scripts/auto-backport.py index bdfdec7b71..330870254a 100755 --- a/.github/scripts/auto-backport.py +++ b/.github/scripts/auto-backport.py @@ -52,7 +52,7 @@ def create_pull_request(repo, new_branch_name, base_branch_name, pr, backport_pr if is_draft: backport_pr.add_to_labels("conflicts") pr_comment = f"@{pr.user.login} - This PR was marked as draft because it has conflicts\n" - pr_comment += "Please resolve them and mark this PR as ready for review" + pr_comment += "Please resolve them and remove the 'conflicts' label. The PR will be made ready for review automatically." backport_pr.create_issue_comment(pr_comment) logging.info(f"Assigned PR to original author: {pr.user}") return backport_pr