Add a note in README

ESCOMP · Aug 28, 2023 · 1e2e2c3 · 1e2e2c3
1 parent fdbb234
commit 1e2e2c3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/doc/README.CHECKLIST.master_tags b/doc/README.CHECKLIST.master_tags
@@ -55,6 +55,14 @@ https://github.com/ESCOMP/ctsm/wiki/CTSM-development-workflow
 
 ---- THE FOLLOWING CAN ONLY BE DONE BY INTEGRATORS ----
 
+NOTE (especially for new integrators): Be sure to follow the recommended
+git setup in
+<https://github.com/ESCOMP/CTSM/wiki/Recommended-git-setup#24additional-recommended-settings-for-integrators>.
+Especially note that you should never use something like `git merge
+escomp/master` to merge the upstream master branch into your local copy:
+instead, you should always use `git pull` with the recommended
+configuration settings (or `git merge --ff-only`) for that scenario.
+
 (7) Merge the PR to master when review is approved
 
 (8) Compare master to branch show that they are identical