Skip to content

Commit 24545a4

Browse files
charlesprostclaude
andauthored
Drop cherry-pick call-to-action from hotfix branch list in merge messages (#266)
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 <noreply@anthropic.com>
1 parent f955646 commit 24545a4

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

bert_e/templates/queued.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ The following branches will **NOT** be impacted:
2424
{% endif %}
2525

2626
{% if pending_hotfixes %}
27-
:warning: This pull request does **not** target the following hotfix
28-
branch(es). Please open a separate cherry-pick pull request to each:
27+
This pull request does not target the following hotfix branch(es) so they
28+
will be left untouched:
2929

3030
{% for branch in pending_hotfixes -%}
3131
* `{{ branch.name }}`

bert_e/templates/successful_merge.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The following branches have **NOT** changed:
1717
{% endif %}
1818

1919
{% if pending_hotfixes %}
20-
:warning: This pull request did **not** target the following hotfix
21-
branch(es). Please open a separate cherry-pick pull request to each:
20+
This pull request did not target the following hotfix branch(es) so they
21+
were left untouched:
2222

2323
{% for branch in pending_hotfixes -%}
2424
* `{{ branch.name }}`

0 commit comments

Comments
 (0)