File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed
contributors/devel/sig-release Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,9 @@ patch release branches.
86
86
Please see our [ recommended Git workflow] ( /contributors/guide/github-workflow.md#workflow ) .
87
87
88
88
- You will need to run the cherry pick script separately for each patch
89
- release you want to cherry pick to.
89
+ release you want to cherry pick to. Cherry picks should be applied to all
90
+ [ active] ( https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md#detailed-release-history-for-active-branches )
91
+ release branches where the fix is applicable.
90
92
91
93
- Your cherry pick PR will immediately get the
92
94
` do-not-merge/cherry-pick-not-approved ` label.
@@ -117,6 +119,12 @@ pull requests on the `master` branch in that they:
117
119
release branch (for example, milestone v1.11 for a cherry pick onto branch
118
120
` release-1.11 ` ). This is normally done for you by automation.
119
121
122
+ - A separate cherry pick pull request should be open for every applicable target
123
+ branch. This ensures that the fix will be present on every active branch for a
124
+ given set of patch releases. If a fix is only applicable to a subset of active
125
+ branches, it is helpful to note why that is the case on the parent pull
126
+ request or on the cherry pick pull requests to the applicable branches.
127
+
120
128
- Have one additional level of review in that they must be approved
121
129
specifically for cherry pick by branch approvers.
122
130
You can’t perform that action at this time.
0 commit comments