From 5ae210605912b1adc6fbedc534d1d3bc607e4978 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 4 May 2021 09:25:11 -0700 Subject: [PATCH] fix a command in RELEASING.rst --- RELEASING.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.rst b/RELEASING.rst index 600c12539..6f4c3465d 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -117,7 +117,7 @@ Both automatic and manual processes described above follow the same steps from t #. Cherry-pick the CHANGELOG / announce files to the ``main`` branch:: git fetch --all --prune - git checkout origin/main -b cherry-pick-release + git checkout upstream/main -b cherry-pick-release git cherry-pick -x -m1 upstream/MAJOR.MINOR.x #. 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.