Skip to content

Commit 7a98cdf

Browse files
committed
Apply suggested rewordings from review
1 parent e6a0c90 commit 7a98cdf

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

doc/devel/release_guide.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ Micro versions should instead read::
8383
Check all active milestones for consistency. Older milestones should also backport
8484
to higher meso versions (e.g. ``v3.6.3`` and ``v3.6-doc`` should backport to both
8585
``v3.6.x`` and ``v3.7.x`` once the ``v3.7.x`` branch exists and while PR backports are
86-
still targeting ``v3.6.x``). Close milestones (and remilestone any issues/PRs) for versions
87-
which are unlikely to be produced.
86+
still targeting ``v3.6.x``).
87+
88+
Close milestones for versions that are unlikely to be released, e.g. micro versions of
89+
older meso releases. Remilestone issues/PRs that are now untagged to the appropriate
90+
future release milestone.
8891

8992
Create the milestone for the next-next meso release (i.e. ``v3.9.0``, as ``v3.8.0``
9093
should already exist). While most active items should go in the next meso release,
@@ -296,7 +299,8 @@ it is important to move all branches away from the commit with the tag [#]_::
296299
git commit --allow-empty
297300

298301
Push the branch to GitHub. This is done prior to pushing the tag as a last step in ensuring
299-
that the branch was fully up to date::
302+
that the branch was fully up to date. If it fails, re-fetch and recreate commits and
303+
tag over an up to date branch::
300304

301305
git push DANGER v3.7.x
302306

0 commit comments

Comments
 (0)