differences for PR #453

Author: actions-user

14-collaboration-using-git.md

@@ -67,26 +67,26 @@ The diagram below shows a typical software development lifecycle with Git
 (in our case starting from making changes in a local branch that "tracks" a remote branch) and the commonly used commands to interact
 with different parts of the Git infrastructure, including:
 
-- **working directory** -
+- **working tree** -
   a local directory (including any subdirectories) where your project files live
   and where you are currently working.
-  It is also known as the "untracked" area of Git.
-  Any changes to files will be marked by Git in the working directory.
-  If you make changes to the working directory and do not explicitly tell Git to save them -
+  It is also known as the "untracked" area of Git or "working directory".
+  Any changes to files will be marked by Git in the working working tree.
+  If you make changes to the working working tree and do not explicitly tell Git to save them -
   you will likely lose those changes.
   Using `git add filename` command,
-  you tell Git to start tracking changes to file `filename` within your working directory.
+  you tell Git to start tracking changes to file `filename` within your working working tree.
 - **staging area (index)** -
   once you tell Git to start tracking changes to files
   (with `git add filename` command),
   Git saves those changes in the staging area on your local machine.
   Each subsequent change to the same file needs to be followed by another `git add filename` command
   to tell Git to update it in the staging area.
-  To see what is in your working directory and staging area at any moment
+  To see what is in your working working tree and staging area at any moment
   (i.e. what changes is Git tracking),
   run the command `git status`.
 - **local repository** -
-  stored within the `.git` directory of your project locally,
+  stored within the `.git` working tree of your project locally,
   this is where Git wraps together all your changes from the staging area
   and puts them using the `git commit` command.
   Each commit is a new, permanent snapshot (checkpoint, record) of your project in time,
@@ -108,12 +108,12 @@ with different parts of the Git infrastructure, including:
 <!--
 Created with https://mermaid.live/edit#pako:eNqVkjFrwzAQhf-KuKmlKd01BAoZ2yUZumi5SmdbRPI58oliQv57JbuloSaFajqd3sd7x-kMlh2BhpFOmXpLO49twmh6Vc4bp6PvW7Xziaxwmh6324eDYFubz4lQq9aLQucW_fVTlb6wxaD2NPDoK77ILcfoZSF-Kyq1p8hCK2zIY7dAK8Ftr4bEdretVgPqOWBH9shZ_stFSi39EXFNfQ0WgrobO05ic4nM6Sd6uYXAH-TU-6Susz3NZvewgVJE9K7s8Fy9DUhHkQzoUjpqMAcxYPpLkWIWPky9BS0p0wby4FC-Vw66wTCWLrma-HX5F_P3uHwCS-vA3Q
 sequenceDiagram
-    Working Directory->>+Staging Area: git add
+    Working working tree->>+Staging Area: git add
     Staging Area->>+Local Repository Branch: git commit
     Local Repository Branch->>+Remote Repository Branch: git push
     Remote Repository Branch->>+Local Repository Branch: git fetch
-    Local Repository Branch->>+Working Directory:git merge
-    Remote Repository Branch->>+Working Directory: git pull (shortcut for git fetch followed by git merge for a 'tracking branch')
+    Local Repository Branch->>+Working working tree:git merge
+    Remote Repository Branch->>+Working working tree: git pull (shortcut for git fetch followed by git merge for a 'tracking branch')
 -->
 
 <!--

md5sum.txt

@@ -11,7 +11,7 @@
 "episodes/11-software-project.md" "f5e403d2b25781407eaed7534dfff9ec" "site/built/11-software-project.md" "2024-12-06"
 "episodes/12-virtual-environments.md" "bc4f97c27cf5f63646f4be54f6c492d8" "site/built/12-virtual-environments.md" "2025-04-01"
 "episodes/13-ides.md" "5a1badf094a9022c001bdbdbf7ceedfa" "site/built/13-ides.md" "2025-03-07"
-"episodes/14-collaboration-using-git.md" "765379f4c22b5a5bd7449f400d8cc140" "site/built/14-collaboration-using-git.md" "2025-04-01"
+"episodes/14-collaboration-using-git.md" "7f5dbeb00ae6c2b3a7c27421155d4a10" "site/built/14-collaboration-using-git.md" "2025-04-29"
 "episodes/15-coding-conventions.md" "edeb54ce0ada9fb1a6ae4b38ea391a63" "site/built/15-coding-conventions.md" "2025-04-01"
 "episodes/16-verifying-code-style-linters.md" "0cb677e60bb505b78e523617f49f33de" "site/built/16-verifying-code-style-linters.md" "2025-03-07"
 "episodes/17-section1-optional-exercises.md" "e41c7fe74d6067e4101908deb100162b" "site/built/17-section1-optional-exercises.md" "2025-04-01"