diff --git a/source/Reviewers/curaterelease.rst b/source/Reviewers/curaterelease.rst index c8c75ce0..fc2e39b5 100644 --- a/source/Reviewers/curaterelease.rst +++ b/source/Reviewers/curaterelease.rst @@ -138,6 +138,9 @@ and the other will review it (**developer** and **reviewer** below). * Disable the ``Require Linear History`` setting * Set the only allowed merge method as ``merge`` (remove ``squash``) + * Disable the ``Require branches to be up to date before merging`` setting + (if commits have been pushed to ``main`` since the release, this would + require ``stable`` to be updated with those, which isn't desired). * The **developer** will make the hotfix change, making sure the branch has been created from ``stable``. Open a PR for this change targetting ``stable`` and diff --git a/source/Reviewers/releases/milestones.rst b/source/Reviewers/releases/milestones.rst index 88dfd367..eeab805e 100644 --- a/source/Reviewers/releases/milestones.rst +++ b/source/Reviewers/releases/milestones.rst @@ -9,6 +9,7 @@ Milestones and Projects ======================= + #. Tidy up all pull requests and issues for the completed milestone in the Simulation Systems Review and Issues Trackers. diff --git a/source/Reviewers/releases/other_repos.rst b/source/Reviewers/releases/other_repos.rst index f1f7c113..ccaa1ef9 100644 --- a/source/Reviewers/releases/other_repos.rst +++ b/source/Reviewers/releases/other_repos.rst @@ -37,6 +37,8 @@ Other Repositories * moci * um_aux * socrates-spectral + * gcom + * rose_picker * mule (if not already done as part of a release) * shumlib (if not already done as part of a release) diff --git a/source/Reviewers/releases/umdp_release.rst b/source/Reviewers/releases/umdp_release.rst index 4ae17037..e068eba5 100644 --- a/source/Reviewers/releases/umdp_release.rst +++ b/source/Reviewers/releases/umdp_release.rst @@ -37,6 +37,8 @@ UMDP Release URL. * It is also worth checking no URLs are out of date. -* With a reviewer, follow the :ref:`release process `. +* Open a PR for this branch, targetting ``main`` and get this reviewed and + committed. +* Once on, follow the :ref:`release process ` with a reviewer. * Ensure the action to publish the documentation has successfully completed and the `new documentation is available `_.