1.
Overview
2.
Course Syllabus
3.
Prework - For Non-Developers
3.1.
Video Transcripts
4.
Prework - For All Students
4.1.
Set Up Git Environment
4.2.
Install Git-Graph plugin for VSCode
4.3.
Intro to git-basics-starter-repo
4.4.
Git From the Command Line
4.4.1.
Three Trees and Git Reset
4.4.2.
Branching
4.4.3.
Merging Without Conflict
4.4.4.
Handle Merge Conflict
5.
Session 1
5.1.
Set Up Starter Repo
5.2.
Simple Collaborative Workflow
5.3.
Walk-through of Simple Workflow
5.3.1.
Step 1 - Everybody checkout main
5.3.2.
Step 2 - Teammate commits work
5.3.3.
Step 3 - Teammate pushes
5.3.4.
Step 4 - I make local changes too
5.3.5.
Step 5.1 - I pull (first 1/2 - fetch)
5.3.6.
Step 5.2 - I pull (second 1/2 - merge
5.3.7.
Step 6 - I push main to "origin"
5.4.
Anatomy of a Git Commit, or, The Three Objects
5.5.
Your Local Git repo and The Three Trees - or, "Intro to git reset"
5.6.
Create And Resolve Merge Conflicts - With Basic Workflow
6.
Objects-and-Trees Exercise
7.
Session 2
7.1.
Add Features As a Team
7.2.
Github Project Boards
7.3.
Intro to Git Cherry-Pick
7.4.
Intro to Git Rebase
8.
Common Git Workflows
9.
Viewing Changes
10.
References & Further Study
11.
Git Basics Cheat Sheet
12.
Instructor Notes
12.1.
Session 1
12.2.
Session 2
Light
Rust
Coal
Navy
Ayu
Git Basics - Collaborating With Git
View/Download as PDF
