This is now an async tutorial

s2t2 · s2t2 · commit 7473532f9438 · 2025-03-16T16:59:26.000-04:00
diff --git a/docs/_quarto.yml b/docs/_quarto.yml
@@ -63,32 +63,32 @@ book:
   chapters:
     - index.qmd
 
-    - "-------------"
+    #- "-------------"
 
-    - part: "Setup Guide (Prereqs)"
-      href: prereqs/index.qmd
+    - part: "Dev Tools Setup"
       chapters:
         - prereqs/github.qmd
         - prereqs/vs-code-text-editor.qmd
-        - prereqs/git-client.qmd
+        - href: prereqs/git-client.qmd
+          text: "GitHub Desktop"
 
 
 
-    - "-------------"
+    #- "-------------"
 
     - part: "Notes"
       chapters:
         - notes/version-control.qmd
 
-    - "-------------"
-    - part: "Workshop Exercises"
+    #- "-------------"
+    - part: "Exercises"
       chapters:
         - href: exercises/hello-version-control/index.qmd
           text: Hello Version Control
         - href: exercises/pull-request-workflow/index.qmd
           text: Pull Request Workflow
         - href: exercises/developer-team-collaboration/index.qmd
-          text: Developer Team Collaboration
+          text: Dev Team Collaboration
         - href: exercises/open-source-collaboration/index.qmd
           text: Open Source Collaboration
 
@@ -99,7 +99,7 @@ book:
 
   appendices:
     - href: notes/clis/brew.qmd
-      text: "Homebrew Package Manager (Mac OS)"
+      text: "Homebrew (Mac OS)"
     - notes/clis/git.qmd
 
   # shows up at bottom of page
diff --git a/docs/exercises/hello-version-control/index.qmd b/docs/exercises/hello-version-control/index.qmd
@@ -1,9 +1,16 @@
-# "Hello Version Control" Exercise
+# "Hello, Version Control" Exercise
+
 
 ## Learning Objectives
 
 Gain familiarity with basic version control operations, including creating repositories, pushing and pulling code, and making commits.
 
+## Walkthrough Video
+
+{{< video https://www.youtube.com/watch?v=UCcbvta2dp4
+    title= "Hello, Version Control Exercise Walkthrough" >}}
+
+
 ## Instructions
 
   1. On GitHub, create a new repository named something like "my-first-repo", and make sure to include a "README.md" file. We'll refer to this as the "remote repository".
@@ -34,15 +41,11 @@ 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.
 
-## Walkthrough Video
 
-{{< video https://www.youtube.com/watch?v=UCcbvta2dp4
-    title= "Hello, Version Control Exercise Walkthrough"
->}}
 
 <hr>
 
-## Optional Further Exploration (Git CLI)
+## Alternative (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.
 
diff --git a/docs/exercises/pull-request-workflow/index.qmd b/docs/exercises/pull-request-workflow/index.qmd
@@ -4,6 +4,11 @@
 
 Adopt a Pull Request Workflow to collaborate with yourself (on independent projects).
 
+## Walkthrough Video
+
+{{< video https://www.youtube.com/watch?v=NTzUbULGc3o
+    title= "Pull Request Workflow Exercise Walkthrough" >}}
+
 ## Instructions
 
 This is a process we will follow to add or revise the contents of our own existing repos. If you have just completed the ["Hello Version Control" exercise](../hello-version-control/index.qmd), you can start at step 3:
@@ -25,15 +30,11 @@ PR Workflow Process:
 
 To repeat the PR Workflow Process (after PR has been merged), repeat steps 3-9 above.
 
-## Walkthrough Video
 
-{{< video https://www.youtube.com/watch?v=NTzUbULGc3o
-    title= "Pull Request Workflow Exercise Walkthrough"
->}}
 
 <hr>
 
-## Optional Further Exploration (Git CLI)
+## Alternative (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.
 
diff --git a/docs/index.qmd b/docs/index.qmd
@@ -4,7 +4,7 @@
 :::
 
 
-Demystify the version control process and learn how to manage and collaborate on coding projects with other researchers and developers. Attendees will become familiar with Git and GitHub.
+Demystify the version control process and learn how to collaborate on coding projects with other researchers and developers.
 
 ## Learning Objectives
 
@@ -15,47 +15,12 @@ Demystify the version control process and learn how to manage and collaborate on
 5. Collaborate with peers by pulling and merging changes from a shared repository.
 6. Troubleshoot common Git errors and conflicts during version control.
 
-## Prerequisites
-
-This workshop requires the following software:
-
-+ GitHub Desktop (requires a GitHub account)
-+ VS Code Text Editor
-
-If you have never worked with these tools before, we will walk you through how to install them. Just follow the [Version Control Tools Setup Guide](./prereqs/index.qmd).
-
-## Agenda
-
-+ 0:00 - Welcome and Announcements:
-  + Make sure you have already installed the prerequisite software before the workshop.
-  + For all workshop exercises, beginners are encouraged to use GitHub Desktop, but any participant desiring further exploration can use the Git CLI instead.
-
-+ 0:05 - [Version Control Terminology and Concepts](./notes/version-control.qmd)
-+ 0:10 - ["Hello Version Control" Exercise](./exercises/hello-version-control/index.qmd):
-  + Gain familiarity with basic version control operations, including creating repositories, pushing and pulling code, and making commits.
-+ 0:30 - ["Pull Request Workflow" Exercise](./exercises/pull-request-workflow/index.qmd):
-  + Adopt a Pull Request Workflow to collaborate with yourself (on independent projects).
-+ 0:50 - ["Developer Team Collaboration" Exercise](./exercises/developer-team-collaboration/index.qmd):
-  + Adopt a Pull Request Workflow to collaborate with teammates, on team projects where you have write access to the repository.
-+ 0:70 - ["Open Source Collaboration" Exercise](./exercises/open-source-collaboration/index.qmd):
-  + Adopt a Pull Request Workflow to collaborate with people you don't know, on open source projects where you don't have write access to the repository.
-+ 0:90 - Stop
-
-
-The agenda above is for a 90 minute workshop, however for a 60 minute workshop, choose either the team exercise or open source exercise, and do the other for homework / self-practice.
 
 ## Additional Resources
 
 Official GitHub Docs:
 
   + <https://docs.github.com/en>
   + <https://docs.github.com/en/get-started/using-github/github-flow>
-  + <https://githubtraining.github.io/training-manual/#>
+  + <https://githubtraining.github.io/training-manual>
   + <https://training.github.com/downloads/github-git-cheat-sheet.pdf>
-
-Here are some additional resources for further exploration:
-
-  + <https://github.com/k88hudson/git-flight-rules>
-  + <https://git-teaching-kit.netlify.app>
-  + <https://swcarpentry.github.io/git-novice>
-  + <https://thecodingtrain.com/tracks/git-and-github-for-poets>
diff --git a/docs/notes/clis/git.qmd b/docs/notes/clis/git.qmd
@@ -1,4 +1,6 @@
-# The `git` Utility
+# The `git` CLI
+
+
 
 > Git is a free and open source distributed version control system. - [Git Website](https://git-scm.com/)
 
@@ -7,15 +9,18 @@
 ## References
 
 Official References:
+
   + [Git Source Code](https://github.com/git/git)
   + [Git Docs](https://git-scm.com/doc)
 
 Beginner References:
+
   + [Git Handbook](https://guides.github.com/introduction/git-handbook/)
   + [Github Guides - YouTube Videos](https://www.youtube.com/githubguides)
   + [An Intro to Git and GitHub - Youtube Video](https://www.youtube.com/watch?v=MJUJ4wbFm_A)
 
 Command-Line References:
+
   + [Git CLI Cheat Sheet](https://education.github.com/git-cheat-sheet-education.pdf)
   + [Getting Started w/ the Git CLI](https://git-scm.com/book/en/v2/Getting-Started-The-Command-Line)
   + [Git Tutorials - Atlassian](https://www.atlassian.com/git/tutorials)
@@ -215,6 +220,7 @@ After pushing successfully, you should be able to visit your remote repository o
 ### Collaboration
 
 References:
+
   + [Intro to Pull Request Work Flow](https://guides.github.com/introduction/flow/)
 
 #### Branch Operations
diff --git a/docs/notes/version-control.qmd b/docs/notes/version-control.qmd
@@ -6,6 +6,13 @@
 
 ![Version Control Image ([source](https://web.archive.org/web/20170216074720/https://www.atlassian.com/git/tutorials/what-is-version-control))](../images/version-control.png)
 
+Version control is a system that tracks changes to files over time, allowing multiple people to collaborate on projects efficiently. It enables developers to revert to previous versions, compare changes, and merge contributions seamlessly. There are two main types of version control: centralized and distributed. Centralized version control systems (CVCS), such as Subversion (SVN), use a single repository for storing all versions, while distributed version control systems (DVCS), like Git, provide each user with a complete copy of the project history, enhancing flexibility and collaboration.
+
+The importance of version control extends beyond software development; it is also used in writing, research, and design projects. By maintaining a detailed history of changes, version control prevents data loss and reduces conflicts when multiple contributors are working on the same files. It also improves accountability by tracking who made specific modifications and when. This is particularly helpful for large-scale projects where team members need to coordinate their efforts while ensuring the integrity and stability of the codebase.
+
+Modern version control systems, especially Git, have become essential tools in software development workflows. They integrate with platforms like GitHub, GitLab, and Bitbucket, facilitating remote collaboration and continuous integration. Version control also enables automated testing and deployment, ensuring that only well-tested code is released into production. By using version control, teams can maintain efficiency, reduce errors, and create a structured development process that supports innovation and long-term project sustainability.
+
+
 ## Terminology
 
 **Repository** (noun): A software development project. Otherwise known as a "repo". In practice, a repository is just directory of files and folders.
diff --git a/docs/prereqs/git-client.qmd b/docs/prereqs/git-client.qmd
@@ -1,41 +1,20 @@
 
-# Version Control Utilities
+# Git Clients
 
-The goal of a "version control" tool is to help us track changes in our code, and easily interface with code hosting and collaboration platforms like GitHub.
+Git is the underlying version control system used by platforms like GitHub.
 
-Git is a leading system for performing version control. Professionals may prefer to use Git from the command line, but there is a learning curve. So beginners are encouraged to get started with GitHub Desktop first, which provides an easier to use graphical user interface (GUI).
-
-In this workshop we will use GitHub Desktop to download repositories from GitHub. We will revisit command-line Git in a future workshop.
+The goal of a Git client is to help us track changes in our code, and interface with code hosting platforms like GitHub. Professionals may prefer to use Git from the command line, but there is a learning curve. Instead, beginners are encouraged to get started with GitHub Desktop, which provides an easier to use graphical user interface (GUI).
 
 ## GitHub Desktop
 
 ### Installation and Configuration
 
-Beginners are encouraged to install [GitHub Desktop software](https://desktop.github.com/), for Mac or Windows.
-
-> NOTE: GitHub Desktop may require the Git command line utility to also be installed on your computer (see below).
+Students are encouraged to install [GitHub Desktop software](https://desktop.github.com/), for Mac or Windows.
 
 After installing, you will need to login with your GitHub account credentials. See this [GitHub Desktop setup guide](https://docs.github.com/en/desktop/installing-and-authenticating-to-github-desktop/setting-up-github-desktop) for more information.
 
-After installing, from the settings, choose VS Code as your default text editor, and either Terminal (Mac) or Git Bash (Windows) as your default command-line utility.
+After installing, from the settings, choose VS Code as your default text editor.
 
 ### Success Criteria
 
-You should be able to open the GitHub Desktop application, and visit the settings to see you are logged in with your GitHub account, and also see the desired tools selected in the integration settings.
-
-## Git CLI
-
-### Installation and Configuration
-
-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`).
-
-### Success Criteria
-
-Verifying Git has been installed:
-
-```sh
-git --version
-```
+You should be able to open the GitHub Desktop application, and visit the settings to see you are logged in with your GitHub account.
diff --git a/docs/prereqs/index.qmd b/docs/prereqs/index.qmd
