Merge pull request #291 from WordPress/update/release-steps

Revise merge instructions for develop to trunk

Co-authored-by: dkotter <dkotter@git.wordpress.org>

Author: jeffpaul

docs/RELEASE_INSTRUCTIONS.md

@@ -20,7 +20,7 @@ This issue is for tracking changes for the X.Y.Z release.  Target release date:
 - [ ] Readme updates: Make any other readme changes as necessary in `README.md` and `readme.txt`.
 - [ ] New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
 - [ ] Merge release PR: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request).
-- [ ] Merge develop to trunk: Do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` now contains the stable development version.
+- [ ] Merge develop to trunk: Do the same for `develop` into `trunk`, ensuring you pull the most recent changes into `develop` first (`git checkout develop && git pull origin develop && git checkout trunk && git pull origin trunk && git merge --no-ff develop`).  `trunk` now contains the stable development version.
 - [ ] Push: Push your trunk branch to GitHub (e.g. `git push origin trunk`).
 - [ ] Compare: Check that no results show in [comparing a merge from develop into trunk](https://github.com/WordPress/ai/compare/trunk...develop) as that means the prior steps completed successfully.
 - [ ] [Wait for build](https://xkcd.com/303/): Head to the [Actions](https://github.com/WordPress/ai/actions) tab in the repo and wait for it to finish if it hasn't already.  If it doesn't succeed, figure out why and start over.