Merge pull request #1245 from RonnyPfannschmidt/howtorelease

add a reminder of the features branch merge to HOWTORELEASE.rst
2015-12-09 18:34:41 -02:00
parent 1c70827f33 d0f5f6676b
commit 8220c05b01
1 changed files with 2 additions and 0 deletions
--- a/HOWTORELEASE.rst
+++ b/HOWTORELEASE.rst
@@ -88,3 +88,5 @@ Note: this assumes you have already registered on pypi.
 13. **after the release** Bump the version number in ``_pytest/__init__.py``,
    to the next Minor release version (i.e. if you released ``pytest-2.8.0``,
    set it to ``pytest-2.9.0.dev1``).
+
+14. merge the actual release into the features branch and do a pull request against it