From d0f5f6676b2326d7cbce45e44ed8be46533116dc Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 9 Dec 2015 21:20:54 +0100 Subject: [PATCH] add a reminder of the features branch merge to HOWTORELEASE.rst --- HOWTORELEASE.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst index 9f40b73f2..ddc89eb42 100644 --- 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