From ef100a5394df4bab54a9ef7116ecbffb39140376 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 19 Nov 2024 17:36:39 +0000 Subject: [PATCH] site deploy Auto-generated via `{sandpaper}` Source : 8fc29840c01bda2567b145b0995550b0d8158d23 Branch : md-outputs Author : GitHub Actions Time : 2024-11-19 17:36:18 +0000 Message : markdown source builds Auto-generated via `{sandpaper}` Source : 4c7a4768724a6490ec1b33ef8010d2c91275226a Branch : main Author : Martino Sorbaro Time : 2024-11-19 17:35:24 +0000 Message : Merge pull request #1052 from JoKeyser/fix-sentence-in-history-quiz-understanding-workflow-and-history Fix sentence in quiz Understanding Workflow and History --- 03-create.html | 4 ++-- 05-history.html | 11 +++++------ 08-collab.html | 2 +- 09-conflict.html | 4 ++-- 14-supplemental-rstudio.html | 2 +- aio.html | 21 ++++++++++----------- discuss.html | 2 +- instructor/03-create.html | 4 ++-- instructor/05-history.html | 11 +++++------ instructor/08-collab.html | 2 +- instructor/09-conflict.html | 4 ++-- instructor/14-supplemental-rstudio.html | 2 +- instructor/aio.html | 21 ++++++++++----------- instructor/discuss.html | 2 +- md5sum.txt | 2 +- pkgdown.yml | 2 +- 16 files changed, 46 insertions(+), 50 deletions(-) diff --git a/03-create.html b/03-create.html index 69d989834..f8ea8512a 100644 --- a/03-create.html +++ b/03-create.html @@ -521,7 +521,7 @@

BASH

Show me the solution

-
+

No. Alfredo does not need to make the desserts subdirectory a Git repository because the recipes @@ -570,7 +570,7 @@

Correcting git init Mistakes

-
+

Background

diff --git a/05-history.html b/05-history.html index 42b835fb5..bfdd80bfe 100644 --- a/05-history.html +++ b/05-history.html @@ -381,7 +381,7 @@

Exploring History

-

Last updated on 2024-11-16 | +

Last updated on 2024-11-19 | Edit this page

@@ -839,10 +839,9 @@

Show me the solution

The answer is 2.

The changes to the file from the second echo command are -only applied to the working copy, The command -git add ketchup.md places the current version of -ketchup.md into the staging area. not the version in the -staging area.

+only applied to the working copy, not the version in the staging area. +The command git add ketchup.md places the current version +of ketchup.md into the staging area.

So, when git commit -m "My opinions about the red sauce" is executed, the version of ketchup.md committed to the repository is the one from the staging area and has only one line.

@@ -1077,7 +1076,7 @@

Key Points

"url": "https://swcarpentry.github.io/git-novice/05-history.html", "identifier": "https://swcarpentry.github.io/git-novice/05-history.html", "dateCreated": "2014-12-04", - "dateModified": "2024-11-16", + "dateModified": "2024-11-19", "datePublished": "2024-11-19" } diff --git a/08-collab.html b/08-collab.html index 385f0b49d..5b8ebb2d9 100644 --- a/08-collab.html +++ b/08-collab.html @@ -640,7 +640,7 @@

Review Changes

-
+

On the command line, the Collaborator can use git fetch origin main to get the remote changes into the diff --git a/09-conflict.html b/09-conflict.html index f14ebc05b..2a90f7c7d 100644 --- a/09-conflict.html +++ b/09-conflict.html @@ -811,7 +811,7 @@

Conflicts on Non-textual files

-
+

Let’s try it. Suppose Alfredo takes a picture of its guacamole and calls it guacamole.jpg.

@@ -1029,7 +1029,7 @@

A Typical Work Session

-
+
diff --git a/14-supplemental-rstudio.html b/14-supplemental-rstudio.html index c939432c7..29057c3e7 100644 --- a/14-supplemental-rstudio.html +++ b/14-supplemental-rstudio.html @@ -548,7 +548,7 @@

Solution to Challenge

-
+

This can be done in Rstudio:

diff --git a/aio.html b/aio.html index a16cbfcc8..cb78d6151 100644 --- a/aio.html +++ b/aio.html @@ -1079,7 +1079,7 @@

BASH

Show me the solution

-
+

No. Alfredo does not need to make the desserts subdirectory a Git repository because the recipes @@ -1128,7 +1128,7 @@

Correcting git init Mistakes

-
+

Background @@ -2114,7 +2114,7 @@

Key Points

Content from Exploring History

-

Last updated on 2024-11-16 | +

Last updated on 2024-11-19 | Edit this page

@@ -2576,10 +2576,9 @@

Show me the solution

The answer is 2.

The changes to the file from the second echo command are -only applied to the working copy, The command -git add ketchup.md places the current version of -ketchup.md into the staging area. not the version in the -staging area.

+only applied to the working copy, not the version in the staging area. +The command git add ketchup.md places the current version +of ketchup.md into the staging area.

So, when git commit -m "My opinions about the red sauce" is executed, the version of ketchup.md committed to the repository is the one from the staging area and has only one line.

@@ -4143,7 +4142,7 @@

Review Changes

-
+

On the command line, the Collaborator can use git fetch origin main to get the remote changes into the @@ -4636,7 +4635,7 @@

Conflicts on Non-textual files

-
+

Let’s try it. Suppose Alfredo takes a picture of its guacamole and calls it guacamole.jpg.

@@ -4879,7 +4878,7 @@

A Typical Work Session

-
+
order action . . . . . .
@@ -5644,7 +5643,7 @@

Solution to Challenge

-
+

This can be done in Rstudio:

diff --git a/discuss.html b/discuss.html index b71f03de1..7b0c3f31b 100644 --- a/discuss.html +++ b/discuss.html @@ -856,7 +856,7 @@

OUTPUT

order action . . . . . .