From 9ac360ed43493807e3d0e8f4f099ea367365fc7a Mon Sep 17 00:00:00 2001 From: Charles Prost Date: Tue, 21 Apr 2026 09:30:01 +0200 Subject: [PATCH] Drop cherry-pick call-to-action from hotfix branch list in merge messages The queued/successful_merge templates were telling developers to open a separate cherry-pick PR to every phantom hotfix branch in the cascade. This is wrong: the repo can have dozens of old post-GA hotfix branches, none of which need a cherry-pick from this PR. The cherry-pick reminder is only appropriate when the Jira ticket explicitly carries a hotfix fix version (handled separately by PendingHotfixVersionReminder). The merge messages should simply note that the hotfix branches were not targeted and were left untouched, with no call to action. Co-Authored-By: Claude Sonnet 4.6 --- bert_e/templates/queued.md | 4 ++-- bert_e/templates/successful_merge.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bert_e/templates/queued.md b/bert_e/templates/queued.md index 462cb8cb..9803ec39 100644 --- a/bert_e/templates/queued.md +++ b/bert_e/templates/queued.md @@ -24,8 +24,8 @@ The following branches will **NOT** be impacted: {% endif %} {% if pending_hotfixes %} -:warning: This pull request does **not** target the following hotfix -branch(es). Please open a separate cherry-pick pull request to each: +This pull request does not target the following hotfix branch(es) so they +will be left untouched: {% for branch in pending_hotfixes -%} * `{{ branch.name }}` diff --git a/bert_e/templates/successful_merge.md b/bert_e/templates/successful_merge.md index bcfee5c0..14325771 100644 --- a/bert_e/templates/successful_merge.md +++ b/bert_e/templates/successful_merge.md @@ -17,8 +17,8 @@ The following branches have **NOT** changed: {% endif %} {% if pending_hotfixes %} -:warning: This pull request did **not** target the following hotfix -branch(es). Please open a separate cherry-pick pull request to each: +This pull request did not target the following hotfix branch(es) so they +were left untouched: {% for branch in pending_hotfixes -%} * `{{ branch.name }}`