diff --git a/.nojekyll b/.nojekyll index 0664184..e9c1f9e 100644 --- a/.nojekyll +++ b/.nojekyll @@ -1 +1 @@ -d546c3c1 \ No newline at end of file +00a32e53 \ No newline at end of file diff --git a/CONTRIBUTING.html b/CONTRIBUTING.html index 2f6210a..5a230ac 100644 --- a/CONTRIBUTING.html +++ b/CONTRIBUTING.html @@ -138,6 +138,10 @@
There are three options for editing the course materials:
+If either option 2 or 3 sounds like a good fit for you, we need to be careful we do not cause merge conflicts! Please make a post in the #lter-grad-course
channel of the NCEAS Slack organization for both when you start working on the website and when you’re finished.
If you’re working in a developer environment (i.e., option 3 above), please pull regularly so that you are editing the most up-to-date materials.
+At this point, we are not using GitHub branches and/or forks so please just work directly in the ‘main’ branch.
+Communicating via email is fine though we also have a channel (#lter-grad-course
) in NCEAS’ Slack organization if that is preferable.
Communicating via email is fine though we also have the #lter-grad-course
channel in NCEAS’ Slack organization if that is preferable.