Skip to content

Commit 22acbaf

Browse files
committed
Minor changes to the release process
As discussed in #7556
1 parent e691d3e commit 22acbaf

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

RELEASING.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ Both automatic and manual processes described above follow the same steps from t
6969

7070
git fetch --all --prune
7171
git checkout origin/master -b cherry-pick-release
72-
git cherry-pick --no-commit -m1 origin/MAJOR.MINOR.x
73-
git checkout origin/master -- changelog
74-
git commit # no arguments
72+
git cherry-pick -x -m1 origin/MAJOR.MINOR.x
73+
74+
#. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step.
7575

7676
#. Send an email announcement with the contents from::
7777

0 commit comments

Comments
 (0)