diff --git a/01-basics.html b/01-basics.html index e33c8b23d..4cd14e0b5 100644 --- a/01-basics.html +++ b/01-basics.html @@ -619,7 +619,7 @@
Running the git ...
command is equivalent to:
Recovering the excellent version is only possible if you created a copy of the old version of the paper. The danger of losing good diff --git a/02-setup.html b/02-setup.html index 1c4bd99ad..2c1afadf0 100644 --- a/02-setup.html +++ b/02-setup.html @@ -554,14 +554,14 @@
FCM, which wraps SVN, is a centralised version control system. There is one central repository stored on a @@ -569,7 +569,7 @@
git status
is equivalent to:
No. You do not need to make the clouds
subdirectory a
Git repository because the weather
repository will track
@@ -727,7 +727,7 @@
git init
Mistakesgit add .
-Running git add
followed by git commit
is
equivalent to:
In FCM there is no concept of a staging area. FCM will commit all file modifications at once. This can lead to rather large commits. In @@ -1115,7 +1115,7 @@
Answer 1 is not descriptive enough, and the purpose of the commit is unclear; and answer 2 is redundant to using “git diff” to see what @@ -1164,7 +1164,7 @@
First we make our changes to the forecast.md
and
atlas.md
files:
If needed, move out of the weather
folder:
If you only want to ignore the contents of data/plots
,
you can change your .gitignore
to ignore only the
@@ -656,7 +656,7 @@
You would add the following two lines to your .gitignore:
If you want to ignore the contents of data/
but not
those of data/csv/
, you can change your
@@ -750,7 +750,7 @@
Appending data/csv/global/temperature/*.dat
will match
every file in data/csv/global/temperature
that ends with
@@ -788,7 +788,7 @@
In the .gitignore
file, write:
The !
modifier will negate an entry from a previously
defined ignore pattern. Because the !*.csv
entry negates
@@ -866,7 +866,7 @@
log_*
or log*
as a new entry
in your .gitignoreHere we have chosen to make our repository public. The visibility of your repository depends on which option you choose:
@@ -758,7 +758,7 @@Ideally before connecting to a new host, like github.com
in the output above, you would check the RSA key fingerprint matches the
@@ -823,7 +823,7 @@
If your new key failed to connect you may need to alter your ssh config.
@@ -1013,7 +1013,7 @@The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -1072,7 +1072,7 @@
GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -1099,7 +1099,7 @@
When we push changes, we’re interacting with a remote repository to update it with the changes we’ve made locally (often this corresponds to @@ -1128,7 +1128,7 @@
In this case, we’d see a merge conflict due to unrelated histories. When GitHub creates a README.md file, it performs a commit in the remote diff --git a/10-pull-requests.html b/10-pull-requests.html index e79605a0b..efed4e553 100644 --- a/10-pull-requests.html +++ b/10-pull-requests.html @@ -571,7 +571,7 @@
This can be done in Rstudio:
Running the git ...
command is equivalent to:
Recovering the excellent version is only possible if you created @@ -925,14 +925,14 @@
FCM, which wraps SVN, is a centralised version control system. There is one central repository stored on a @@ -1302,7 +1302,7 @@
git status
is equivalent to:
No. You do not need to make the clouds
subdirectory a
Git repository because the weather
repository will track
@@ -1462,7 +1462,7 @@
git init
Mistakesgit add .
-Running git add
followed by git commit
is
equivalent to:
In FCM there is no concept of a staging area. FCM will commit all file modifications at once. This can lead to rather large commits. In @@ -2709,7 +2709,7 @@
Answer 1 is not descriptive enough, and the purpose of the commit is unclear; and answer 2 is redundant to using “git diff” to see what @@ -2760,7 +2760,7 @@
First we make our changes to the forecast.md
and
atlas.md
files:
If needed, move out of the weather
folder:
If you only want to ignore the contents of data/plots
,
you can change your .gitignore
to ignore only the
@@ -4155,7 +4155,7 @@
You would add the following two lines to your .gitignore:
If you want to ignore the contents of data/
but not
those of data/csv/
, you can change your
@@ -4249,7 +4249,7 @@
Appending data/csv/global/temperature/*.dat
will match
every file in data/csv/global/temperature
that ends with
@@ -4287,7 +4287,7 @@
In the .gitignore
file, write:
The !
modifier will negate an entry from a previously
defined ignore pattern. Because the !*.csv
entry negates
@@ -4367,7 +4367,7 @@
log_*
or log*
as a new entry
@@ -4490,7 +4490,7 @@ Here we have chosen to make our repository public. The visibility of your repository depends on which option you choose:
@@ -4748,7 +4748,7 @@Ideally before connecting to a new host, like github.com
in the output above, you would check the RSA key fingerprint matches the
@@ -4813,7 +4813,7 @@
If your new key failed to connect you may need to alter your ssh config.
@@ -5007,7 +5007,7 @@The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -5066,7 +5066,7 @@
GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -5093,7 +5093,7 @@
When we push changes, we’re interacting with a remote repository to update it with the changes we’ve made locally (often this corresponds to @@ -5122,7 +5122,7 @@
In this case, we’d see a merge conflict due to unrelated histories. When GitHub creates a README.md file, it performs a commit in the remote @@ -5502,7 +5502,7 @@
This can be done in Rstudio:
Branch main set up to track remote branch main from origin by rebasing.
-When you are exploring the GitHub interface you may wish to show:
+And mention that these are covered in more detail in the Git & +GitHub Working Practices training. You can also mention that it is +possible to edit files via the GitHub interface but we won’t be doing +that today.
+Take this opportunity to show the learners where the glossary can be found. Explain the difference between Git & GitHub using the @@ -636,7 +636,7 @@
Running the git ...
command is equivalent to:
Recovering the excellent version is only possible if you created a copy of the old version of the paper. The danger of losing good diff --git a/instructor/02-setup.html b/instructor/02-setup.html index 23513dfea..afd6cea34 100644 --- a/instructor/02-setup.html +++ b/instructor/02-setup.html @@ -556,14 +556,14 @@