keep releases.md in sync with containerd/containerd

Signed-off-by: Samuel Karp <samuelkarp+automated@google.com>
2023-06-02 03:05:26 +00:00 · 2023-06-02 03:05:26 +00:00 · fbe6896e41
parent ef13a4ef00
commit fbe6896e41
1 changed files with 5 additions and 0 deletions
--- a/content/releases.md
+++ b/content/releases.md
@ -195,6 +195,11 @@ process:
 	```console
 	$ git cherry-pick -xsS <commit>
 	```
+
+   If all of the work from a particular PR/set of PRs is wanted,
+   cherry-pick the individual commits instead of the merge commit.
+   Take #8624 for example, 82ec62b is favored over 9e834e7.
+
   (Optional) If other commits exist in the main branch which are related
   to the cherry-picked commit; eg: fixes to the main PR. It is recommended
   to cherry-pick those commits also into this same `my-backport-branch`.