Workaround quarto file inclusion bug - add git cli solutions to botto…

…m of exercise instead of separate file
s2t2 · Sep 25, 2024 · fddf0f2 · fddf0f2
1 parent 7d99ba3
commit fddf0f2
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 46 deletions.
diff --git a/docs/_quarto.yml b/docs/_quarto.yml
@@ -80,6 +80,7 @@ book:
       chapters:
         - notes/version-control.qmd
 
+    - "-------------"
     - part: "Workshop Exercises"
       chapters:
         - href: exercises/hello-version-control/index.qmd
@@ -96,8 +97,10 @@ book:
     - "-------------"
 
 
-  #appendices:
-
+  appendices:
+    - href: notes/clis/brew.qmd
+      text: "Homebrew Package Manager (Mac OS)"
+    - notes/clis/git.qmd
 
   # shows up at bottom of page
   #body-footer: "&copy; Copyright 2024, Your Name Here"

diff --git a/docs/exercises/hello-version-control/cli-solutions.qmd b/docs/exercises/hello-version-control/cli-solutions.qmd
diff --git a/docs/exercises/hello-version-control/index.qmd b/docs/exercises/hello-version-control/index.qmd
@@ -34,6 +34,45 @@ For more information about Markdown syntax, see the [Markdown Cheat Sheet](https
 
 Once you see the updated README file contents reflected in your remote repository on GitHub, you have succeeded. Repeat the file-editing, committing and pushing steps at least one more time for good measure.
 
-## Further Exploration (Git CLI)
+<hr>
 
-If you are using Git from the command-line, feel free to reference these [exercise solutions](./cli-solutions.qmd).
+## Optional Further Exploration (Git CLI)
+
+Beginners are recommended to use GitHub Desktop to complete the exercise above, however if anyone is interested in completing the exercise using Git from the command line, see the commands below.
+
+Create a GitHub repo (perhaps called "my-first-repo"), obtain its remote address, then clone the repo and navigate there from the command line:
+
+```sh
+cd ~/Desktop
+git clone REMOTE_ADDRESS # where REMOTE_ADDRESS is the remote address of your GitHub repo
+cd my-first-repo/
+```
+
+Open the project in the text editor:
+
+```sh
+code .
+```
+
+Create a file using the text editor (or use the command line):
+
+```sh
+touch my_file.md
+```
+
+Edit and save the file, then stage the changes and make a local commit:
+
+```sh
+git add .
+git commit -m "My first commit"
+```
+
+Push the changes up to GitHub:
+
+```sh
+git push origin main
+
+```
+
+
+Repeat the process of editing and committing and pushing as desired.
diff --git a/docs/prereqs/git-client.qmd b/docs/prereqs/git-client.qmd
@@ -30,7 +30,7 @@ You should be able to open the GitHub Desktop application, and visit the setting
 Installing Git depends on your operating system:
 
   + Windows users who have installed [Git Bash](https://git-scm.com/downloads) will have satisfied the Git installation requirement.
-  + Mac users may find that a system version of Git is already installed, and that might be sufficient to satisfy the Git installation requirement. Any Mac users who encounter errors or who desire a newer version of Git can install Git from https://git-scm.com/downloads, or consider [installing Homebrew](../notes/clis/brew.qmd), and using Homebrew to install Git (`brew install git`).
+  + Mac users may find that a system version of Git is already installed, and that might be sufficient to satisfy the Git installation requirement. Any Mac users who encounter errors or who desire a newer version of Git can install Git from <https://git-scm.com/downloads>, or consider [installing Homebrew](../notes/clis/brew.qmd), and using Homebrew to install Git (`brew install git`).
 
 ### Success Criteria