Update release instructions

Author: jtgrasb

.github/RELEASING.md

@@ -13,14 +13,15 @@ git pull <upstream remote name> dev
 git checkout main
 git pull <upstream remote name> main
 ```
-**Note: replace <upstream remote name> with the name of your upstream remote.
+Note: replace <upstream remote name> with the name of your upstream remote.
 * Merge the `dev` branch into the `main` branch using the command line:
 ```
 git checkout main
 git merge dev --ff-only
 git push <upstream remote name> main
 ```
 **Note: the `dev` branch should only be merged into `main` when it is ready for a new release.**
+If the merge does not work because the `main` branch is ahead of the `dev` branch, the commits from `main` should be cherry-picked to add them to `dev`.
 
 ## GitHub
 In the GitHub repository, click on *Releases*, click on *Draft new release*.