Dev guide updates (#529)

E3SM-Project · Nov 14, 2023 · f232e4f · f232e4f
1 parent bc8c334
commit f232e4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/source/dev_guide/release.rst b/docs/source/dev_guide/release.rst
@@ -61,7 +61,7 @@ Bumping the Version
         :: Looking good? (y/N)
         >
 
-3. If you encounter ``Error: Command `git push upstream main` failed``, as in `issue 470 <https://github.com/E3SM-Project/zppy/issues/470>`_, you can run ``git push upstream main`` yourself.
+3. If you encounter ``Error: Command `git push upstream main` failed``, as in `issue 470 <https://github.com/E3SM-Project/zppy/issues/470>`_, you can run ``git push upstream <branch>`` yourself.
 
 4. Create a pull request to the main repo and merge it. Mark yourself as the assignee, and mark "Update version" as the label.
 

diff --git a/docs/source/dev_guide/release_testing.rst b/docs/source/dev_guide/release_testing.rst
@@ -125,7 +125,10 @@ Testing directions for making a release
     * If there are only expected failures, then update the expected files. Use the "Commands to run to replace outdated expected files" from the links on step 8. Then repeat step 9.
     * If there are no failures at all, proceed to the next step.
 
-11. Make a pull request and merge any changes. This keeps the repo updated with the latest testing configurations. Mark yourself as the assignee, and mark "Testing" as the label. If you made bug fixes, add the "semver: bug" label.
+11. Run ``git diff``. All of your changes should be from editing ``tests/integration/utils.py`` in step 5, and running it in step 8.
+
+    * If this is the case, you can delete this testing branch.
+    * If not, you have probably made code changes to get the tests to pass. Make a pull request to merge the changes. Add the "semver: bug" label.
 
 12. Wrap up release testing: