Skip to content

Commit d61df01

Browse files
committed
add note to get CAM or CAM-SIMA PRs approved and ready before emrging atmos_phys
1 parent 729c4c7 commit d61df01

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

docs/atmospheric_physics/development_workflow.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ The general workflow for adding a feature, bug-fix, or modification to atmospher
1515
1. **RECOMMENDED: Rerun [CAM](https://github.com/ESCOMP/CAM/wiki/CAM-SE-Workflows#run-cam-tests) and/or [CAM-SIMA](../development/cam-testing.md#regression-testing) regression tests to ensure your updates haven't broken anything.**
1616
1. **[Update `doc/NamesNotInDictionary.txt` file.](#updating-namesnotindictionarytxt-file)**
1717
1. **If you know that this PR will need an official tag, then also add the [tag name](Tagging-Instructions.md/#tag-naming-conventions) to the PR description.**
18-
1. **Squash the commits and merge the PR (e.g. the "squash and merge" option).**
18+
1. **If this PR contains updates that will impact CAM, DO NOT MERGE the PR until you have been assigned a CAM tag by the CAM gatekeeper**
19+
- If there are associated changes to CAM-SIMA, it is also good practice to get those changes approved before merging the atmospheric_physics PR.
20+
1. **Once you're ready to merge, squash the commits and merge the PR (e.g. the "squash and merge" option).**
1921

2022
If you need an official tag for your new additions, then once your `development` PR has been merged you will need to do the following:
2123

0 commit comments

Comments
 (0)