Skip to content

Commit 17c22b9

Browse files
authored
docs: mention branch update in checklist (#2670)
1 parent 32d11c9 commit 17c22b9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

docs/release.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ To release a new version of pybind11:
3333
issues are entered in the changelog (clear the label when done).
3434
- ``git add`` and ``git commit``, ``git push``. **Ensure CI passes**. (If it
3535
fails due to a known flake issue, either ignore or restart CI.)
36-
- Add a release branch if this is a new minor version
37-
- ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
36+
- Add a release branch if this is a new minor version, or update the existing release branch if it is a patch version
37+
- New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
38+
- Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
3839
- Update tags (optional; if you skip this, the GitHub release makes a
3940
non-annotated tag for you)
4041
- ``git tag -a vX.Y.Z -m 'vX.Y.Z release'``.

0 commit comments

Comments
 (0)