Tracking Changes
-Last updated on 2024-12-11 | +
Last updated on 2025-01-10 | Edit this page
@@ -1001,10 +1001,10 @@BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -1351,7 +1351,7 @@ Key Points
"url": "https://swcarpentry.github.io/git-novice/04-changes.html",
"identifier": "https://swcarpentry.github.io/git-novice/04-changes.html",
"dateCreated": "2014-12-04",
- "dateModified": "2024-12-11",
+ "dateModified": "2025-01-10",
"datePublished": "2025-01-10"
}
diff --git a/05-history.html b/05-history.html
index 70054283a4..d2fdc6e456 100644
--- a/05-history.html
+++ b/05-history.html
@@ -724,7 +724,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -777,7 +777,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -837,7 +837,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -900,7 +900,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore 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 02e187e0ad..45256a6034 100644
--- a/07-github.html
+++ b/07-github.html
@@ -860,7 +860,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -919,7 +919,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -946,7 +946,7 @@
Push vs. Commit
-
+
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
@@ -975,7 +975,7 @@
GitHub License and README files
-
+
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/08-collab.html b/08-collab.html
index 49ae216ffc..bb861b4bfb 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 d9a84d5070..e7ffb1c126 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
-
+
order
action . . . . . .
diff --git a/aio.html b/aio.html
index 39f0738bdf..00b91de73c 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
-
+
Content from Tracking Changes
-Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
@@ -1810,10 +1810,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -2457,7 +2457,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -2512,7 +2512,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -2574,7 +2574,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -2637,7 +2637,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore can not be used
directly. Let’s look at the output of git status:
@@ -3697,7 +3697,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -3756,7 +3756,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -3783,7 +3783,7 @@
Push vs. Commit
-
+
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
@@ -3812,7 +3812,7 @@
GitHub License and README files
-
+
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
@@ -4144,7 +4144,7 @@
Review Changes
-
+
On the command line, the Collaborator can use
git fetch origin main to get the remote changes into the
@@ -4637,7 +4637,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -4880,7 +4880,7 @@ A Typical Work Session
-
+
diff --git a/discuss.html b/discuss.html
index a504df9293..048d881d43 100644
--- a/discuss.html
+++ b/discuss.html
@@ -856,7 +856,7 @@ OUTPUT<
-
+
To do this, your .gitignore would look like this:
diff --git a/instructor/03-create.html b/instructor/03-create.html
index f4852d9c88..8d8f6a6439 100644
--- a/instructor/03-create.html
+++ b/instructor/03-create.html
@@ -523,7 +523,7 @@ BASH
Show me the solution
-
+
No. Alfredo does not need to make the desserts
subdirectory a Git repository because the recipes
@@ -572,7 +572,7 @@
Correcting git init Mistakes
-
+
Background
diff --git a/instructor/04-changes.html b/instructor/04-changes.html
index 9d63646e8f..cfd37e534d 100644
--- a/instructor/04-changes.html
+++ b/instructor/04-changes.html
@@ -381,7 +381,7 @@
Tracking Changes
- Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
@@ -1003,10 +1003,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -1353,7 +1353,7 @@ Key Points
"url": "https://swcarpentry.github.io/git-novice/instructor/04-changes.html",
"identifier": "https://swcarpentry.github.io/git-novice/instructor/04-changes.html",
"dateCreated": "2014-12-04",
- "dateModified": "2024-12-11",
+ "dateModified": "2025-01-10",
"datePublished": "2025-01-10"
}
diff --git a/instructor/05-history.html b/instructor/05-history.html
index 35ec686334..96b51ff5f9 100644
--- a/instructor/05-history.html
+++ b/instructor/05-history.html
@@ -726,7 +726,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -779,7 +779,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -839,7 +839,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -902,7 +902,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore 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 046d2ab516..25c540615b 100644
--- a/instructor/07-github.html
+++ b/instructor/07-github.html
@@ -862,7 +862,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -921,7 +921,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -948,7 +948,7 @@
Push vs. Commit
-
+
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
@@ -977,7 +977,7 @@
GitHub License and README files
-
+
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/08-collab.html b/instructor/08-collab.html
index 7181302510..b12496ee65 100644
--- a/instructor/08-collab.html
+++ b/instructor/08-collab.html
@@ -642,7 +642,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/instructor/09-conflict.html b/instructor/09-conflict.html
index 9b3978eb4c..3520e272f9 100644
--- a/instructor/09-conflict.html
+++ b/instructor/09-conflict.html
@@ -813,7 +813,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -1031,7 +1031,7 @@ A Typical Work Session
-
+
order
action . . . . . .
diff --git a/instructor/aio.html b/instructor/aio.html
index ffa9a8e376..9637643202 100644
--- a/instructor/aio.html
+++ b/instructor/aio.html
@@ -1084,7 +1084,7 @@ BASH
Show me the solution
-
+
No. Alfredo does not need to make the desserts
subdirectory a Git repository because the recipes
@@ -1133,7 +1133,7 @@
Correcting git init Mistakes
-
+
Content from Tracking Changes
-Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
Estimated time: 20 minutes
@@ -1816,10 +1816,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -2464,7 +2464,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -2519,7 +2519,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -2581,7 +2581,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -2644,7 +2644,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore can not be used
directly. Let’s look at the output of git status:
@@ -3706,7 +3706,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -3765,7 +3765,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -3792,7 +3792,7 @@
Push vs. Commit
-
+
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
@@ -3821,7 +3821,7 @@
GitHub License and README files
-
+
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
@@ -4154,7 +4154,7 @@
Review Changes
-
+
On the command line, the Collaborator can use
git fetch origin main to get the remote changes into the
@@ -4648,7 +4648,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -4891,7 +4891,7 @@ A Typical Work Session
-
+
diff --git a/instructor/discuss.html b/instructor/discuss.html
index 4b62769c06..c5ed1a5810 100644
--- a/instructor/discuss.html
+++ b/instructor/discuss.html
@@ -858,7 +858,7 @@ OUTPUT<
-
+
To do this, your .gitignore would look like this:
diff --git a/md5sum.txt b/md5sum.txt
index cd8e23524f..a8257e11ae 100644
--- a/md5sum.txt
+++ b/md5sum.txt
@@ -6,7 +6,7 @@
"episodes/01-basics.md" "78184e84f5bf3b0dd88de3918e927591" "site/built/01-basics.md" "2024-06-20"
"episodes/02-setup.md" "94e00017d43e8b2b539ccc74e544efc9" "site/built/02-setup.md" "2024-11-04"
"episodes/03-create.md" "c1198fc3106059d83fd8078d57fbbfef" "site/built/03-create.md" "2024-09-29"
-"episodes/04-changes.md" "0b972b1afd9dcf567468ed8a7d9ace90" "site/built/04-changes.md" "2024-12-11"
+"episodes/04-changes.md" "51c0538a695de9843efaaca67bbb1dc3" "site/built/04-changes.md" "2025-01-10"
"episodes/05-history.md" "3b224629481c5de036ca242aa69190d5" "site/built/05-history.md" "2025-01-10"
"episodes/06-ignore.md" "259cee882f99ef27b4187846c74d2716" "site/built/06-ignore.md" "2024-11-04"
"episodes/07-github.md" "f304552a6647364988d54291d44e6a40" "site/built/07-github.md" "2024-11-19"
diff --git a/pkgdown.yml b/pkgdown.yml
index 752179ca13..59e21890dc 100644
--- a/pkgdown.yml
+++ b/pkgdown.yml
@@ -2,4 +2,4 @@ pandoc: 3.1.11
pkgdown: 2.1.1
pkgdown_sha: ~
articles: {}
-last_built: 2025-01-10T03:36Z
+last_built: 2025-01-10T03:37Z
Key Points
"url": "https://swcarpentry.github.io/git-novice/04-changes.html", "identifier": "https://swcarpentry.github.io/git-novice/04-changes.html", "dateCreated": "2014-12-04", - "dateModified": "2024-12-11", + "dateModified": "2025-01-10", "datePublished": "2025-01-10" } diff --git a/05-history.html b/05-history.html index 70054283a4..d2fdc6e456 100644 --- a/05-history.html +++ b/05-history.html @@ -724,7 +724,7 @@Recovering Older Versions of a File
-The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -777,7 +777,7 @@
Reverting a Commit
-The command git log lists project history with commit
IDs.
OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -900,7 +900,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore 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 02e187e0ad..45256a6034 100644
--- a/07-github.html
+++ b/07-github.html
@@ -860,7 +860,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -919,7 +919,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -946,7 +946,7 @@
Push vs. Commit
-
+
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
@@ -975,7 +975,7 @@
GitHub License and README files
-
+
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/08-collab.html b/08-collab.html
index 49ae216ffc..bb861b4bfb 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 d9a84d5070..e7ffb1c126 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
-
+
order
action . . . . . .
diff --git a/aio.html b/aio.html
index 39f0738bdf..00b91de73c 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
-
+
Content from Tracking Changes
-Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
@@ -1810,10 +1810,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -2457,7 +2457,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -2512,7 +2512,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -2574,7 +2574,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -2637,7 +2637,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore can not be used
directly. Let’s look at the output of git status:
@@ -3697,7 +3697,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -3756,7 +3756,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -3783,7 +3783,7 @@
Push vs. Commit
-
+
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
@@ -3812,7 +3812,7 @@
GitHub License and README files
-
+
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
@@ -4144,7 +4144,7 @@
Review Changes
-
+
On the command line, the Collaborator can use
git fetch origin main to get the remote changes into the
@@ -4637,7 +4637,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -4880,7 +4880,7 @@ A Typical Work Session
-
+
diff --git a/discuss.html b/discuss.html
index a504df9293..048d881d43 100644
--- a/discuss.html
+++ b/discuss.html
@@ -856,7 +856,7 @@ OUTPUT<
-
+
To do this, your .gitignore would look like this:
diff --git a/instructor/03-create.html b/instructor/03-create.html
index f4852d9c88..8d8f6a6439 100644
--- a/instructor/03-create.html
+++ b/instructor/03-create.html
@@ -523,7 +523,7 @@ BASH
Show me the solution
-
+
No. Alfredo does not need to make the desserts
subdirectory a Git repository because the recipes
@@ -572,7 +572,7 @@
Correcting git init Mistakes
-
+
Background
diff --git a/instructor/04-changes.html b/instructor/04-changes.html
index 9d63646e8f..cfd37e534d 100644
--- a/instructor/04-changes.html
+++ b/instructor/04-changes.html
@@ -381,7 +381,7 @@
Tracking Changes
- Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
@@ -1003,10 +1003,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -1353,7 +1353,7 @@ Key Points
"url": "https://swcarpentry.github.io/git-novice/instructor/04-changes.html",
"identifier": "https://swcarpentry.github.io/git-novice/instructor/04-changes.html",
"dateCreated": "2014-12-04",
- "dateModified": "2024-12-11",
+ "dateModified": "2025-01-10",
"datePublished": "2025-01-10"
}
diff --git a/instructor/05-history.html b/instructor/05-history.html
index 35ec686334..96b51ff5f9 100644
--- a/instructor/05-history.html
+++ b/instructor/05-history.html
@@ -726,7 +726,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -779,7 +779,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -839,7 +839,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -902,7 +902,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore 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 046d2ab516..25c540615b 100644
--- a/instructor/07-github.html
+++ b/instructor/07-github.html
@@ -862,7 +862,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -921,7 +921,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -948,7 +948,7 @@
Push vs. Commit
-
+
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
@@ -977,7 +977,7 @@
GitHub License and README files
-
+
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/08-collab.html b/instructor/08-collab.html
index 7181302510..b12496ee65 100644
--- a/instructor/08-collab.html
+++ b/instructor/08-collab.html
@@ -642,7 +642,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/instructor/09-conflict.html b/instructor/09-conflict.html
index 9b3978eb4c..3520e272f9 100644
--- a/instructor/09-conflict.html
+++ b/instructor/09-conflict.html
@@ -813,7 +813,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -1031,7 +1031,7 @@ A Typical Work Session
-
+
order
action . . . . . .
diff --git a/instructor/aio.html b/instructor/aio.html
index ffa9a8e376..9637643202 100644
--- a/instructor/aio.html
+++ b/instructor/aio.html
@@ -1084,7 +1084,7 @@ BASH
Show me the solution
-
+
No. Alfredo does not need to make the desserts
subdirectory a Git repository because the recipes
@@ -1133,7 +1133,7 @@
Correcting git init Mistakes
-
+
Content from Tracking Changes
-Last updated on 2024-12-11 |
+
Last updated on 2025-01-10 |
Edit this page
Estimated time: 20 minutes
@@ -1816,10 +1816,10 @@ BASHvia git add) to our repository. This is the
reason why you will sometimes see .gitkeep files in
-otherwise empty directories. Unlike .gitignore, these files
-are not special and their sole purpose is to populate a directory so
-that Git adds it to the repository. In fact, you can name such files
-anything you like.
+otherwise empty directories. The sole purpose of .gitkeep
+files is to populate a directory so that Git adds it to the repository.
+The name .gitkeep is just a convention, and in fact, you
+can name these files anything you like.
- If you create a directory in your Git repository and populate it
with files, you can add all files in the directory at once by:
@@ -2464,7 +2464,7 @@ Recovering Older Versions of a File
-
+
The answer is (5)-Both 2 and 4.
The restore command restores files from the repository,
@@ -2519,7 +2519,7 @@
Reverting a Commit
-
+
The command git log lists project history with commit
IDs.
@@ -2581,7 +2581,7 @@ OUTPUT<
-
+
The answer is 2.
The changes to the file from the second echo command are
@@ -2644,7 +2644,7 @@
Getting Rid of Staged Changes
-
+
After adding a change, git restore can not be used
directly. Let’s look at the output of git status:
@@ -3706,7 +3706,7 @@ GitHub GUI
-
+
The left-most button (with the picture of a clipboard) copies the
full identifier of the commit to the clipboard. In the shell,
@@ -3765,7 +3765,7 @@
GitHub Timestamp
-
+
GitHub displays timestamps in a human readable relative format
(i.e. “22 hours ago” or “three weeks ago”). However, if you hover over
@@ -3792,7 +3792,7 @@
Push vs. Commit
-
+
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
@@ -3821,7 +3821,7 @@
GitHub License and README files
-
+
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
@@ -4154,7 +4154,7 @@
Review Changes
-
+
On the command line, the Collaborator can use
git fetch origin main to get the remote changes into the
@@ -4648,7 +4648,7 @@
Conflicts on Non-textual files
-
+
Let’s try it. Suppose Alfredo takes a picture of its guacamole and
calls it guacamole.jpg.
@@ -4891,7 +4891,7 @@ A Typical Work Session
-
+
diff --git a/instructor/discuss.html b/instructor/discuss.html
index 4b62769c06..c5ed1a5810 100644
--- a/instructor/discuss.html
+++ b/instructor/discuss.html
@@ -858,7 +858,7 @@ OUTPUT<
-
+
To do this, your .gitignore would look like this:
diff --git a/md5sum.txt b/md5sum.txt
index cd8e23524f..a8257e11ae 100644
--- a/md5sum.txt
+++ b/md5sum.txt
@@ -6,7 +6,7 @@
"episodes/01-basics.md" "78184e84f5bf3b0dd88de3918e927591" "site/built/01-basics.md" "2024-06-20"
"episodes/02-setup.md" "94e00017d43e8b2b539ccc74e544efc9" "site/built/02-setup.md" "2024-11-04"
"episodes/03-create.md" "c1198fc3106059d83fd8078d57fbbfef" "site/built/03-create.md" "2024-09-29"
-"episodes/04-changes.md" "0b972b1afd9dcf567468ed8a7d9ace90" "site/built/04-changes.md" "2024-12-11"
+"episodes/04-changes.md" "51c0538a695de9843efaaca67bbb1dc3" "site/built/04-changes.md" "2025-01-10"
"episodes/05-history.md" "3b224629481c5de036ca242aa69190d5" "site/built/05-history.md" "2025-01-10"
"episodes/06-ignore.md" "259cee882f99ef27b4187846c74d2716" "site/built/06-ignore.md" "2024-11-04"
"episodes/07-github.md" "f304552a6647364988d54291d44e6a40" "site/built/07-github.md" "2024-11-19"
diff --git a/pkgdown.yml b/pkgdown.yml
index 752179ca13..59e21890dc 100644
--- a/pkgdown.yml
+++ b/pkgdown.yml
@@ -2,4 +2,4 @@ pandoc: 3.1.11
pkgdown: 2.1.1
pkgdown_sha: ~
articles: {}
-last_built: 2025-01-10T03:36Z
+last_built: 2025-01-10T03:37Z
The answer is 2.
The changes to the file from the second echo command are
@@ -900,7 +900,7 @@
Getting Rid of Staged Changes
-After adding a change, git restore can not be used
directly. Let’s look at the output of git status:
GitHub GUI
-The left-most button (with the picture of a clipboard) copies the full identifier of the commit to the clipboard. In the shell, @@ -919,7 +919,7 @@
GitHub Timestamp
-GitHub displays timestamps in a human readable relative format (i.e. “22 hours ago” or “three weeks ago”). However, if you hover over @@ -946,7 +946,7 @@
Push vs. Commit
-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 @@ -975,7 +975,7 @@
GitHub License and README files
-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/08-collab.html b/08-collab.html index 49ae216ffc..bb861b4bfb 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 d9a84d5070..e7ffb1c126 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.
A Typical Work Session
-| order | action . . . . . . | diff --git a/aio.html b/aio.html index 39f0738bdf..00b91de73c 100644 --- a/aio.html +++ b/aio.html @@ -1079,7 +1079,7 @@
|---|
| order | action . . . . . . | diff --git a/instructor/aio.html b/instructor/aio.html index ffa9a8e376..9637643202 100644 --- a/instructor/aio.html +++ b/instructor/aio.html @@ -1084,7 +1084,7 @@
|---|