diff --git a/03-create.html b/03-create.html index a2b5695fd7..ea1abb9942 100644 --- a/03-create.html +++ b/03-create.html @@ -489,7 +489,7 @@

Show me the solution

-
+

No. Dracula does not need to make the moons subdirectory a Git repository because the planets repository can track @@ -540,7 +540,7 @@

Solution – USE WITH CAUTION!

-
+

Background

diff --git a/05-history.html b/05-history.html index 5955c7cc81..893f30fc18 100644 --- a/05-history.html +++ b/05-history.html @@ -704,7 +704,7 @@

Show me the solution

-
+

The answer is (5)-Both 2 and 4.

The checkout command restores files from the repository, @@ -766,7 +766,7 @@

Show me the solution

-
+

The command git log lists project history with commit IDs.

@@ -829,7 +829,7 @@

Show me the solution

-
+

The answer is 2.

The command git add venus.txt places the current version @@ -895,7 +895,7 @@

Show me the solution

-
+

After adding a change, git checkout can not be used directly. Let’s look at the output of git status:

diff --git a/07-github.html b/07-github.html index afc57efa7c..97618c48aa 100644 --- a/07-github.html +++ b/07-github.html @@ -814,7 +814,7 @@

Show me the solution

-
+

The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -878,7 +878,7 @@

Show me the solution

-
+

GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -908,7 +908,7 @@

Show me the solution

-
+

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 @@ -940,7 +940,7 @@

Show me the solution

-
+

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/09-conflict.html b/09-conflict.html index 2bcb4c2a49..775216c4db 100644 --- a/09-conflict.html +++ b/09-conflict.html @@ -697,7 +697,7 @@

Show me the solution

-
+

Let’s try it. Suppose Dracula takes a picture of Martian surface and calls it mars.jpg.

@@ -917,7 +917,7 @@

Show me the solution

-
+
diff --git a/14-supplemental-rstudio.html b/14-supplemental-rstudio.html index 1fe26369d6..cbe6a3b802 100644 --- a/14-supplemental-rstudio.html +++ b/14-supplemental-rstudio.html @@ -495,7 +495,7 @@

Solution to Challenge

-
+

This can be done in Rstudio:

diff --git a/aio.html b/aio.html index 29b04b644d..4b6fe2a66b 100644 --- a/aio.html +++ b/aio.html @@ -1054,7 +1054,7 @@

Show me the solution

-
+

No. Dracula does not need to make the moons subdirectory a Git repository because the planets repository can track @@ -1105,7 +1105,7 @@

Solution – USE WITH CAUTION!

-
+

Background @@ -2462,7 +2462,7 @@

Show me the solution

-
+

The answer is (5)-Both 2 and 4.

The checkout command restores files from the repository, @@ -2526,7 +2526,7 @@

Show me the solution

-
+

The command git log lists project history with commit IDs.

@@ -2591,7 +2591,7 @@

Show me the solution

-
+

The answer is 2.

The command git add venus.txt places the current version @@ -2657,7 +2657,7 @@

Show me the solution

-
+

After adding a change, git checkout can not be used directly. Let’s look at the output of git status:

@@ -3752,7 +3752,7 @@

Show me the solution

-
+

The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -3816,7 +3816,7 @@

Show me the solution

-
+

GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -3846,7 +3846,7 @@

Show me the solution

-
+

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 @@ -3878,7 +3878,7 @@

Show me the solution

-
+

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 @@ -4653,7 +4653,7 @@

Show me the solution

-
+

Let’s try it. Suppose Dracula takes a picture of Martian surface and calls it mars.jpg.

@@ -4898,7 +4898,7 @@

Show me the solution

-
+
order action . . . . . .
@@ -5693,7 +5693,7 @@

Solution to Challenge

-
+

This can be done in Rstudio:

diff --git a/index.html b/index.html index 3f71e89535..ffc6b43fa8 100644 --- a/index.html +++ b/index.html @@ -141,6 +141,7 @@

@@ -386,7 +387,43 @@

Prerequisites
  • Git installation on Linux
  • -

    Preparing Your Working Directory +

    Creating a GitHub Account +

    +

    You will need an account for GitHub +to follow episodes 7 & 8 in this lesson.

    +
    1. Go to https://github.com and follow the “Sign up” link at the +top-right of the window.
    2. +
    3. Follow the instructions to create an account.
    4. +
    5. Verify your email address with GitHub.
    6. +
    7. Configure multifactor authentication (see below).
    8. +
    +

    Multi-factor Authentication

    +

    In 2023, GitHub introduced a requirement for all accounts to have multi-factor +authentication (2FA) configured for extra security. Several options +exist for setting up 2FA, which are summarised here:

    +
    1. If you already use an authenticator app, like Google +Authenticator or Duo +Mobile on your smartphone for example, add +GitHub to that app.
    2. +
    3. If you have access to a smartphone but do not already use an +authenticator app, install one and add +GitHub to the app.
    4. +
    5. If you do not have access to a smartphone or do not want to install +an authenticator app, you have two options: +
      1. +set +up 2FA via text message (list +of countries where authentication by SMS is supported), or
      2. +
      3. +use +a hardware security key like YubiKey +or the Google +Titan key.
      4. +
    6. +

    The GitHub documentation provides more +details about configuring 2FA.

    +
    +

    Preparing Your Working Directory


    We’ll do our work in the Desktop folder so make sure you change your working directory to it with:

    diff --git a/instructor/03-create.html b/instructor/03-create.html index eb8866d89a..7765780fd6 100644 --- a/instructor/03-create.html +++ b/instructor/03-create.html @@ -490,7 +490,7 @@

    Show me the solution

    -
    +

    No. Dracula does not need to make the moons subdirectory a Git repository because the planets repository can track @@ -541,7 +541,7 @@

    Solution – USE WITH CAUTION!

    -
    +

    Background

    diff --git a/instructor/05-history.html b/instructor/05-history.html index 7a6987f35c..54402e095d 100644 --- a/instructor/05-history.html +++ b/instructor/05-history.html @@ -705,7 +705,7 @@

    Show me the solution

    -
    +

    The answer is (5)-Both 2 and 4.

    The checkout command restores files from the repository, @@ -767,7 +767,7 @@

    Show me the solution

    -
    +

    The command git log lists project history with commit IDs.

    @@ -830,7 +830,7 @@

    Show me the solution

    -
    +

    The answer is 2.

    The command git add venus.txt places the current version @@ -896,7 +896,7 @@

    Show me the solution

    -
    +

    After adding a change, git checkout can not be used directly. Let’s look at the output of git status:

    diff --git a/instructor/07-github.html b/instructor/07-github.html index b364e857d6..7dd8ff0e70 100644 --- a/instructor/07-github.html +++ b/instructor/07-github.html @@ -815,7 +815,7 @@

    Show me the solution

    -
    +

    The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -879,7 +879,7 @@

    Show me the solution

    -
    +

    GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -909,7 +909,7 @@

    Show me the solution

    -
    +

    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 @@ -941,7 +941,7 @@

    Show me the solution

    -
    +

    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/instructor/09-conflict.html b/instructor/09-conflict.html index e0fa6b3ca1..86a561ccfb 100644 --- a/instructor/09-conflict.html +++ b/instructor/09-conflict.html @@ -698,7 +698,7 @@

    Show me the solution

    -
    +

    Let’s try it. Suppose Dracula takes a picture of Martian surface and calls it mars.jpg.

    @@ -918,7 +918,7 @@

    Show me the solution

    -
    +

    diff --git a/instructor/14-supplemental-rstudio.html b/instructor/14-supplemental-rstudio.html index 6ee56359a8..86d1492083 100644 --- a/instructor/14-supplemental-rstudio.html +++ b/instructor/14-supplemental-rstudio.html @@ -496,7 +496,7 @@

    Solution to Challenge

    -
    +

    This can be done in Rstudio:

    diff --git a/instructor/aio.html b/instructor/aio.html index 6f97c3be88..63c6498f28 100644 --- a/instructor/aio.html +++ b/instructor/aio.html @@ -1053,7 +1053,7 @@

    Show me the solution

    -
    +

    No. Dracula does not need to make the moons subdirectory a Git repository because the planets repository can track @@ -1104,7 +1104,7 @@

    Solution – USE WITH CAUTION!

    -
    +

    Background @@ -2463,7 +2463,7 @@

    Show me the solution

    -
    +

    The answer is (5)-Both 2 and 4.

    The checkout command restores files from the repository, @@ -2527,7 +2527,7 @@

    Show me the solution

    -
    +

    The command git log lists project history with commit IDs.

    @@ -2592,7 +2592,7 @@

    Show me the solution

    -
    +

    The answer is 2.

    The command git add venus.txt places the current version @@ -2658,7 +2658,7 @@

    Show me the solution

    -
    +

    After adding a change, git checkout can not be used directly. Let’s look at the output of git status:

    @@ -3755,7 +3755,7 @@

    Show me the solution

    -
    +

    The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -3819,7 +3819,7 @@

    Show me the solution

    -
    +

    GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -3849,7 +3849,7 @@

    Show me the solution

    -
    +

    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 @@ -3881,7 +3881,7 @@

    Show me the solution

    -
    +

    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 @@ -4658,7 +4658,7 @@

    Show me the solution

    -
    +

    Let’s try it. Suppose Dracula takes a picture of Martian surface and calls it mars.jpg.

    @@ -4903,7 +4903,7 @@

    Show me the solution

    -
    +
    order action . . . . . .
    @@ -5703,7 +5703,7 @@

    Solution to Challenge

    -
    +

    This can be done in Rstudio:

    diff --git a/instructor/index.html b/instructor/index.html index 2b968545e0..6d4eac9568 100644 --- a/instructor/index.html +++ b/instructor/index.html @@ -519,7 +519,43 @@

    Prerequisites
  • Git installation on Linux
  • -

    Preparing Your Working Directory +

    Creating a GitHub Account +

    +

    You will need an account for GitHub +to follow episodes 7 & 8 in this lesson.

    +
    1. Go to https://github.com and follow the “Sign up” link at the +top-right of the window.
    2. +
    3. Follow the instructions to create an account.
    4. +
    5. Verify your email address with GitHub.
    6. +
    7. Configure multifactor authentication (see below).
    8. +
    +

    Multi-factor Authentication

    +

    In 2023, GitHub introduced a requirement for all accounts to have multi-factor +authentication (2FA) configured for extra security. Several options +exist for setting up 2FA, which are summarised here:

    +
    1. If you already use an authenticator app, like Google +Authenticator or Duo +Mobile on your smartphone for example, add +GitHub to that app.
    2. +
    3. If you have access to a smartphone but do not already use an +authenticator app, install one and add +GitHub to the app.
    4. +
    5. If you do not have access to a smartphone or do not want to install +an authenticator app, you have two options: +
      1. +set +up 2FA via text message (list +of countries where authentication by SMS is supported), or
      2. +
      3. +use +a hardware security key like YubiKey +or the Google +Titan key.
      4. +
    6. +

    The GitHub documentation provides more +details about configuring 2FA.

    +
    +

    Preparing Your Working Directory


    We’ll do our work in the Desktop folder so make sure you change your working directory to it with:

    diff --git a/md5sum.txt b/md5sum.txt index c6a51b2509..ff50ddeaa7 100644 --- a/md5sum.txt +++ b/md5sum.txt @@ -20,5 +20,5 @@ "instructors/instructor-notes.md" "8711174c9d3e1f433cdcf9b30cd571d9" "site/built/instructor-notes.md" "2023-09-18" "learners/discuss.md" "8893316c5cf0dee6a42dd818f6e21122" "site/built/discuss.md" "2023-09-18" "learners/reference.md" "d976a57639fa49361d9c8431850cde6a" "site/built/reference.md" "2023-05-08" -"learners/setup.md" "23b85ccb109a06c5d61c976b31735e35" "site/built/setup.md" "2023-07-26" +"learners/setup.md" "19ccf15a75716fe39f1116abf68a380d" "site/built/setup.md" "2023-09-26" "profiles/learner-profiles.md" "60b93493cf1da06dfd63255d73854461" "site/built/learner-profiles.md" "2023-05-08" diff --git a/pkgdown.yml b/pkgdown.yml index 24643e0159..73edb874fa 100644 --- a/pkgdown.yml +++ b/pkgdown.yml @@ -2,5 +2,5 @@ pandoc: 2.19.2 pkgdown: 2.0.7 pkgdown_sha: ~ articles: {} -last_built: 2023-09-26T00:05Z +last_built: 2023-09-26T15:00Z