From a85b12d4d0bc7e05bc7dc3fa6b024522a7440245 Mon Sep 17 00:00:00 2001 From: "Hsing-Yu (David) Chen" Date: Thu, 1 Jun 2023 17:04:54 -0700 Subject: [PATCH] docs: cherry-pick individual commits instead of merge commit Signed-off-by: Hsing-Yu (David) Chen --- RELEASES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASES.md b/RELEASES.md index 160cfa40e..c6b379ee3 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -193,6 +193,11 @@ process: ```console $ git cherry-pick -xsS ``` + + 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`.