More releasing guide updates (#3420)

* More releasing guide updates * Add doc on release branch PRs Signed-off-by: Stewart X Addison <sxa@redhat.com>
adoptium · Jul 13, 2023 · 9e3da2d · 9e3da2d
1 parent 4ed9a0e
commit 9e3da2d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/RELEASING.md b/RELEASING.md
@@ -56,6 +56,8 @@ Create release branch in the format `vYYYY.MM.NN` on each of the following repos
 
 These branches should be named according to the following format (vYYYY.MM+NN) ,e.g v2023.03+01 , whereby the final element is an incremental counter appended to the year and month of the release.
 
+If anything needs to be merged into the new branch, it should typically be merged into master, then a `git cherry-pick` operation should be done to create a new PR against the release branch. This can typically be merged without further approval.
+
 #### Code Freeze message
 
 Paste the below message into the #release channel in Slack:
@@ -183,6 +185,8 @@ jdk8armStep1["ReleaseChampion check once GA tag on jdk8 aarch32Linux is ready"]
 
 ```
 
+</details>
+
 ### Dry run tests: Do this at least 2 weeks before release in the same calendar month
 
 It is recommended that we perform an auto trigger test on a chosen version (suggest jdk8 and one other) to validate the trigger and build processes and the release pipeline. jdk-17 example: