Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 01_materials/03_git_log_checkout.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ls

Clone an existing repository from GitHub:
```bash
git clone https://github.com/simeon-demo/recipe-book.git
git clone https://github.com/gvwilson/recipe-book.git
```

Navigate into the cloned repository:
Expand Down
2 changes: 1 addition & 1 deletion 01_materials/05_git_merge_conflicts.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Setup: Clone the Team Playlist Repository

```bash
git clone https://github.com/simeon-demo/team-playlist.git
git clone https://github.com/gvwilson/team-playlist.git
cd team-playlist-demo
```

Expand Down
10 changes: 5 additions & 5 deletions 01_materials/git_cheatsheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
## 🔧 Configuration

```bash
git --help # Show overview of Git commands
git config --global user.name "Simeon" # Set your Git username globally
git config --global user.email "me@simeon.dev" # Set your Git email globally
git config list --global # List global Git configuration settings
git config --global core.editor "code --wait" # Set VS Code as default Git editor
git --help # Show overview of Git commands
git config --global user.name "gvwilson" # Set your Git username globally
git config --global user.email "gvwilson@third-bit.com" # Set your Git email globally
git config list --global # List global Git configuration settings
git config --global core.editor "code --wait" # Set VS Code as default Git editor
```

---
Expand Down
534 changes: 534 additions & 0 deletions 01_materials/slides/git_as_story.html

Large diffs are not rendered by default.

Binary file modified 01_materials/slides/git_as_story.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion 02_activities/practice/git_advanced.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The `dtxe/DSI_git_assignment` repository contains a short Python script that
loads the TTC Bus Delay dataset, computes the average delay by route, then
plots the average delay as a histogram.
s
1. Clone this repository: https://github.com/dtxe/DSI_git_assignment
1. Clone this repository: https://github.com/gvwilson/DSI_git_assignment
* `git clone`

### Task 1
Expand Down
11 changes: 0 additions & 11 deletions 03_instructional_team/markdown_slides/git_as_story.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,17 +270,6 @@ Merging combines branches:
2. Combine the **differences** from both branches
3. Create a new commit with combined work


---

## 11. The Staging Area

**Problem:** Sometimes you make a bunch of unrelated edits.

**Best practice:** Package related changes together in one commit.

**Challenge:** What if you forgot to commit before making other changes?

---

## 11. The Staging Area
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,21 @@ Participants should review the [Assignment Submission Guide](https://github.com/
**Questions can be submitted to the #cohort-8-help channel on Slack**

* Technical Facilitator:
* **Simeon Wong**
me@simeon.dev
* **Greg Wilson** gvwilson@third-bit.com

* Learning Support Staff:
* **Dmytro Bonislavskyi**
dmytro.bonislavskyi@gmail.com
* **Moniz Chan**
chanmoniz526@gmail.com
* **Xindi Zhang**
xindi.zhang@mail.utoronto.ca
* **Dmytro Bonislavskyi** dmytro.bonislavskyi@gmail.com
* **Sergii Khomych** svkhomich1@gmail.com / khsergvl
* **Anjali Shrivastava** anju_shrivastava@yahoo.com / anjali-deshpande-hub

 
## Delivery of the Learning Module

## Delivery of the Learning Module

This module will include live learning sessions and optional, asynchronous work periods. During live learning sessions, the Technical Facilitator will introduce and explain key concepts and demonstrate core skills. Learning is facilitated during this time. Before and after each live learning session, the instructional team will be available for questions related to the core concepts of the module. Optional work periods are to be used to seek help from peers, the Learning Support team, and to work through the practice problems and assignments in the learning module, with access to live help. Content is not facilitated, but rather this time should be driven by participants. We encourage participants to come to these work periods with questions and problems to work through.

Participants are encouraged to engage actively during the learning module. The key to developing the core skills in each learning module is through practice. The more participants engage in coding along with the instructional team, and applying the skills in each module, the more likely it is that these skills will solidify.


Participants are encouraged to engage actively during the learning module. They key to developing the core skills in each learning module is through practice. The more participants engage in coding along with the instructional team, and applying the skills in each module, the more likely it is that these skills will solidify.


## Requirements

* Participants are not expected to have any coding experience; the learning content has been designed for beginners.
Expand Down