From 6bb3205aeed4465599b8eb9c1b4f2bab728bac4c Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 20 Nov 2023 17:04:17 +0000 Subject: [PATCH] site deploy Auto-generated via {sandpaper} Source : 5da8156b1ec5df5fcf5e45e8fa2f583c89861499 Branch : md-outputs Author : GitHub Actions Time : 2023-11-20 17:03:58 +0000 Message : markdown source builds Auto-generated via {sandpaper} Source : 602843c953ca6c2fe75f2824f98e196a94d6f940 Branch : main Author : Martino Sorbaro Time : 2023-11-20 17:02:59 +0000 Message : Merge pull request #977 from unode/patch-1 Include reference to git installation from chapter 2 --- 02-setup.html | 17 +++++++++++++++-- 03-create.html | 4 ++-- 04-changes.html | 8 ++++---- 09-conflict.html | 4 ++-- aio.html | 31 ++++++++++++++++++++++--------- discuss.html | 2 +- instructor/02-setup.html | 17 +++++++++++++++-- instructor/03-create.html | 4 ++-- instructor/04-changes.html | 8 ++++---- instructor/09-conflict.html | 4 ++-- instructor/aio.html | 31 ++++++++++++++++++++++--------- instructor/discuss.html | 2 +- md5sum.txt | 2 +- pkgdown.yml | 2 +- 14 files changed, 94 insertions(+), 42 deletions(-) diff --git a/02-setup.html b/02-setup.html index 7ef99ea5f9..6bacdea790 100644 --- a/02-setup.html +++ b/02-setup.html @@ -324,7 +324,7 @@


Setting Up Git

-

Last updated on 2023-09-11 | +

Last updated on 2023-11-20 | Edit this page

@@ -360,6 +360,19 @@

Objectives

+
+
+ +
+
+

Install Git first +

+
+

If you got this far but haven’t installed Git yet, follow these installation +steps.

+
+
+

When we use Git on a new computer for the first time, we need to configure a few things. Below are a few examples of configurations we will set as we get started with Git:

@@ -682,7 +695,7 @@

Keypoints 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/04-changes.html b/04-changes.html index 69409c89a6..8bfcc6d9fd 100644 --- a/04-changes.html +++ b/04-changes.html @@ -982,7 +982,7 @@

Show me the solution

-
+

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

Show me the solution

-
+
  1. Would only create a commit if files have already been staged.
  2. Would try to create a new repository.
  3. @@ -1072,7 +1072,7 @@

    Show me the solution

    -
    +

    The output below from cat mars.txt reflects only content added during this exercise. Your output may vary.

    @@ -1159,7 +1159,7 @@

    Show me the solution

    -
    +

    If needed, move out of the planets folder:

    diff --git a/09-conflict.html b/09-conflict.html index fe0386c0b8..3be3136b1f 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/aio.html b/aio.html index 71e5e4c2ff..10ce51d902 100644 --- a/aio.html +++ b/aio.html @@ -552,7 +552,7 @@

    Keypoints

    Content from Setting Up Git


    -

    Last updated on 2023-09-11 | +

    Last updated on 2023-11-20 | Edit this page

    @@ -586,6 +586,19 @@

    Objectives

    +
    +
    + +
    +
    +

    Install Git first +

    +
    +

    If you got this far but haven’t installed Git yet, follow these installation +steps.

    +
    +
    +

    When we use Git on a new computer for the first time, we need to configure a few things. Below are a few examples of configurations we will set as we get started with Git:

    @@ -1054,7 +1067,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 +1118,7 @@

    Solution – USE WITH CAUTION!

    -
    +

    Background @@ -1830,7 +1843,7 @@

    Show me the solution

    -
    +

    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 @@ -1884,7 +1897,7 @@

    Show me the solution

    -
    +
    1. Would only create a commit if files have already been staged.
    2. @@ -1926,7 +1939,7 @@

      Show me the solution

      -
      +

      The output below from cat mars.txt reflects only content added during this exercise. Your output may vary.

      @@ -2015,7 +2028,7 @@

      Show me the solution

      -
      +

      If needed, move out of the planets folder:

      @@ -4653,7 +4666,7 @@

      Show me the solution

      -
      +

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

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

      Show me the solution

      -
      +
    order action . . . . . .
    diff --git a/discuss.html b/discuss.html index 8eab25752a..dd95785f0c 100644 --- a/discuss.html +++ b/discuss.html @@ -805,7 +805,7 @@

    Show me the solution

    -
    +

    To do this, your .gitignore would look like this:

    diff --git a/instructor/02-setup.html b/instructor/02-setup.html index 7e6d2bd3ce..fd9cc86e0f 100644 --- a/instructor/02-setup.html +++ b/instructor/02-setup.html @@ -323,7 +323,7 @@


    Setting Up Git

    -

    Last updated on 2023-09-11 | +

    Last updated on 2023-11-20 | Edit this page

    @@ -361,6 +361,19 @@

    Objectives

    +
    +
    + +
    +
    +

    Install Git first +

    +
    +

    If you got this far but haven’t installed Git yet, follow these installation +steps.

    +
    +
    +

    When we use Git on a new computer for the first time, we need to configure a few things. Below are a few examples of configurations we will set as we get started with Git:

    @@ -683,7 +696,7 @@

    Keypoints Show me the solution

    -
    diff --git a/instructor/aio.html b/instructor/aio.html index 5f9da61f71..932b3702eb 100644 --- a/instructor/aio.html +++ b/instructor/aio.html @@ -549,7 +549,7 @@

    Keypoints

    Content from Setting Up Git


    -

    Last updated on 2023-09-11 | +

    Last updated on 2023-11-20 | Edit this page

    Estimated time 5 minutes

    @@ -584,6 +584,19 @@

    Objectives

    +
    +
    + +
    +
    +

    Install Git first +

    +
    +

    If you got this far but haven’t installed Git yet, follow these installation +steps.

    +
    +
    +

    When we use Git on a new computer for the first time, we need to configure a few things. Below are a few examples of configurations we will set as we get started with Git:

    @@ -1053,7 +1066,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 +1117,7 @@

    Solution – USE WITH CAUTION!

    -
    +

    Background @@ -1830,7 +1843,7 @@

    Show me the solution

    -
    +

    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 @@ -1884,7 +1897,7 @@

    Show me the solution

    -
    +
    1. Would only create a commit if files have already been staged.
    2. @@ -1926,7 +1939,7 @@

      Show me the solution

      -
      +

      The output below from cat mars.txt reflects only content added during this exercise. Your output may vary.

      @@ -2015,7 +2028,7 @@

      Show me the solution

      -
      +

      If needed, move out of the planets folder:

      @@ -4658,7 +4671,7 @@

      Show me the solution

      -
      +

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

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

      Show me the solution

      -
      +
    order action . . . . . .
    diff --git a/instructor/discuss.html b/instructor/discuss.html index 51e1d25ae1..3c292f1a99 100644 --- a/instructor/discuss.html +++ b/instructor/discuss.html @@ -806,7 +806,7 @@

    Show me the solution

    -
    +

    To do this, your .gitignore would look like this:

    diff --git a/md5sum.txt b/md5sum.txt index ff50ddeaa7..780d751192 100644 --- a/md5sum.txt +++ b/md5sum.txt @@ -4,7 +4,7 @@ "config.yaml" "69e678021a92f74f922e53d180d05f47" "site/built/config.yaml" "2023-05-08" "index.md" "a0bf9198af03d79145509a9fd132ab8d" "site/built/index.md" "2023-05-08" "episodes/01-basics.md" "31f60f1f17daa4cb4d919d0902ffbc7f" "site/built/01-basics.md" "2023-07-28" -"episodes/02-setup.md" "5afa0e80062ab1477afe913a22923306" "site/built/02-setup.md" "2023-09-11" +"episodes/02-setup.md" "3a8ecc078effa0ce7cb71a201254a135" "site/built/02-setup.md" "2023-11-20" "episodes/03-create.md" "b7ad40f47369cac2251a357ba5b76011" "site/built/03-create.md" "2023-08-09" "episodes/04-changes.md" "b1ba204b17c9a74adcf2cd8bc81d7a4c" "site/built/04-changes.md" "2023-06-22" "episodes/05-history.md" "6a6581cc3a5e0d0824b3baca10421b32" "site/built/05-history.md" "2023-05-08" diff --git a/pkgdown.yml b/pkgdown.yml index c466c602dd..06203c7b7d 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-11-20T17:01Z +last_built: 2023-11-20T17:04Z