Commit 24545a4
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
| 27 | + | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
| 20 | + | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
0 commit comments