File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -138,6 +138,9 @@ and the other will review it (**developer** and **reviewer** below).
138138
139139 * Disable the ``Require Linear History `` setting
140140 * Set the only allowed merge method as ``merge `` (remove ``squash ``)
141+ * Disable the ``Require branches to be up to date before merging `` setting
142+ (if commits have been pushed to ``main `` since the release, this would
143+ require ``stable `` to be updated with those, which isn't desired).
141144
142145* The **developer ** will make the hotfix change, making sure the branch has been
143146 created from ``stable ``. Open a PR for this change targetting ``stable `` and
Original file line number Diff line number Diff line change 99Milestones and Projects
1010=======================
1111
12+
1213#. Tidy up all pull requests and issues for the completed milestone in the
1314 Simulation Systems Review and Issues Trackers.
1415
Original file line number Diff line number Diff line change @@ -37,6 +37,8 @@ Other Repositories
3737 * moci
3838 * um_aux
3939 * socrates-spectral
40+ * gcom
41+ * rose_picker
4042 * mule (if not already done as part of a release)
4143 * shumlib (if not already done as part of a release)
4244
Original file line number Diff line number Diff line change @@ -37,6 +37,8 @@ UMDP Release
3737 URL.
3838
3939* It is also worth checking no URLs are out of date.
40- * With a reviewer, follow the :ref: `release process <github-releases >`.
40+ * Open a PR for this branch, targetting ``main `` and get this reviewed and
41+ committed.
42+ * Once on, follow the :ref: `release process <github-releases >` with a reviewer.
4143* Ensure the action to publish the documentation has successfully completed and
4244 the `new documentation is available <https://metoffice.github.io/um_doc/ >`_.
You can’t perform that action at this time.
0 commit comments