Drop cherry-pick call-to-action from hotfix branch list in merge messages#266
Merged
charlesprost merged 1 commit intomainfrom Apr 21, 2026
Merged
Conversation
…ages 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>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #266 +/- ##
=======================================
Coverage 89.28% 89.28%
=======================================
Files 77 77
Lines 10287 10287
=======================================
Hits 9185 9185
Misses 1102 1102
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
queued.mdandsuccessful_merge.mdwere telling developers to open a cherry-pick PR to every phantom hotfix branch in the cascade — which can be dozens of old, finished post-GA branches (e.g. scality/Integration#1426 showed 29 hotfix branches).PendingHotfixVersionRemindercomment, code 223).Before:
After:
Test plan
test_dev_pr_reminder_about_pre_ga_hotfixstill passes (branch name still appears in message)🤖 Generated with Claude Code