Skip to content

Commit 133614e

Browse files
committed
Note about merging directly to release branch.
1 parent 9b4f9a0 commit 133614e

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

docs/src/developers_guide/release.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ New features shall not be included in a patch release, these are for bug fixes.
8888
A patch release does not require a release candidate, but the rest of the
8989
release process is to be followed.
9090

91+
As mentioned in :ref:`release_branch`: branch/commit management is much simpler
92+
if the patch changes are **first merged into the release branch** -
93+
e.g. ``v1.9.x`` - and are only added to ``main`` during :ref:`merge_back` (post
94+
release).
95+
9196

9297
Before Release
9398
--------------
@@ -111,6 +116,8 @@ from the `latest CF standard names`_.
111116
The Release
112117
-----------
113118

119+
.. _release_branch:
120+
114121
Release Branch
115122
~~~~~~~~~~~~~~
116123

@@ -193,6 +200,8 @@ of the new release. Ideally this would be updated before the release, but
193200
the DOI for the new version is only available once the release has been
194201
created in GitHub.
195202

203+
.. _merge_back:
204+
196205
Merge Back
197206
~~~~~~~~~~
198207

0 commit comments

Comments
 (0)