summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kanzhelev <S.Kanzhelev@live.com>2021-04-09 12:08:44 -0700
committerGitHub <noreply@github.com>2021-04-09 12:08:44 -0700
commit33f4ce62a51cdfe91458726dcf10ed2fc402af1d (patch)
tree512cf0a30ea56159b80c9fcd9144ceb7530c9b9b
parente864fc569168f5c5da7da1c6efef8f64997b323a (diff)
Update cherry-picks.md
-rw-r--r--contributors/devel/sig-release/cherry-picks.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/contributors/devel/sig-release/cherry-picks.md b/contributors/devel/sig-release/cherry-picks.md
index 43a68b10..1b95c933 100644
--- a/contributors/devel/sig-release/cherry-picks.md
+++ b/contributors/devel/sig-release/cherry-picks.md
@@ -121,6 +121,16 @@ pull requests on the `master` branch in that they:
- Are by default expected to be `kind/bug` and `priority/critical-urgent`.
+- The original change to the `master` branch is expected to be merged for
+ some time and no related CI failures or test flakiness must be discovered.
+
+- The easy way to compare changes from the original change and cherry-pick
+ is to compare PRs `.patch` files. To generate the patch from
+ PR, just add the `.patch` to PR url. For example, for PR #100972 in
+ kubernetes repositry, ptach can be downloaded following this URL:
+
+ `https://github.com/kubernetes/kubernetes/pull/100972.patch`
+
- Milestones must be set on the PR reflecting the milestone for the target
release branch (for example, milestone v1.11 for a cherry pick onto branch
`release-1.11`). This is normally done for you by automation.