From 17c22b9e0f56276f212b44f6cf0e6846a01623b2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 16 Nov 2020 10:18:43 -0500 Subject: [PATCH] docs: mention branch update in checklist (#2670) --- docs/release.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index b5348bfbb..80ec71366 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -33,8 +33,9 @@ To release a new version of pybind11: issues are entered in the changelog (clear the label when done). - ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it fails due to a known flake issue, either ignore or restart CI.) -- Add a release branch if this is a new minor version - - ``git checkout -b vX.Y``, ``git push -u origin vX.Y`` +- Add a release branch if this is a new minor version, or update the existing release branch if it is a patch version + - New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y`` + - Update branch: ``git checkout vX.Y``, ``git merge ``, ``git push`` - Update tags (optional; if you skip this, the GitHub release makes a non-annotated tag for you) - ``git tag -a vX.Y.Z -m 'vX.Y.Z release'``.