github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8627 from davidhsingyuchen/cherry-pick-no-merge

Browse Source
This commit is contained in:
Derek McGowan 2023-06-01 18:08:25 -07:00 committed by GitHub
commit 023128bd35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RELEASES.md
View File

@ -193,6 +193,11 @@ process:
```console ```console
$ git cherry-pick -xsS <commit> $ 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 (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 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`. to cherry-pick those commits also into this same `my-backport-branch`.