Skip to content

Commit

Permalink
Merge pull request pytest-dev#8635 from asottile/fix-release
Browse files Browse the repository at this point in the history
fix a command in RELEASING.rst
  • Loading branch information
Anthony Sottile authored May 4, 2021
2 parents 2534b77 + 5ae2106 commit a62a28b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion RELEASING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit a62a28b

Please sign in to comment.