Module 3: Git
Module 3: Git
Module 3: Git
Weeks 1–2: Foundations & Local Workflow (80 hrs)
| Topic Block | Focus | Key Topics | Capstone / Assessment | Hours | Notes | Study Files |
|---|---|---|---|---|---|---|
| Block 1 | Setup & Local Workflows | git init, clone, add, commit, status, log, diff, .gitignore basics | 16 | Setup & Basics · Local Workflow | ||
| Block 2 | Remote Collaboration | push, pull, fetch, remote origins, GitHub account setup | 16 | Remote Collaboration | ||
| Block 3 | Branching Fundamentals | Create & switch branches, merge basics, branch naming strategy | 16 | Branching & Merging | ||
| Block 4 | Merge Conflicts | Identifying conflicts, resolving conflicts, conflict best practices | 16 | Fixing Mistakes · Branching & Merging | ||
| Block 5 | Assessment | Review & consolidation of Blocks 1–4 | Capstone: Task Management App with full Git workflow | 16 | Assessed by senior | Weeks 1–2 Curriculum |
| Part 1 Exam |
Weeks 3–4: Advanced Workflows & Collaboration (80 hrs)
| Topic Block | Focus | Key Topics | Capstone / Assessment | Hours | Notes | Study Files |
|---|---|---|---|---|---|---|
| Block 6 | Git + VSCode & Stash | VSCode Git integration, git stash / stash pop, GUI vs CLI comparison | 16 | VSCode & Stash Guide | ||
| Block 7 | Rebase & Advanced | git rebase, interactive rebase, cherry-pick | 16 | Advanced Workflows | ||
| Block 8 | Pull Requests & Review | Creating PRs, code review process, approvals & merges on GitHub | 16 | Remote Collaboration | ||
| Block 9 | Team Collaboration | Real team scenarios, branch protection rules, commit message conventions | 16 | Advanced Workflows | ||
| Block 10 | Final Capstone | Review & consolidation of Blocks 6–9 | Capstone: Full-Stack Note-Taking App with professional Git workflow | 16 | Final assessment | Weeks 3–4 Curriculum |
| Part 2 Exam |
Study Resources
| # | Resource Name | Type | URL |
|---|---|---|---|
| 1 | Official Study Guide | Guide | link |
| 1b | Cheat Sheet & Practice | Guide | link |
| 1c | Vi Quick Guide | Guide | link |
| 1d | Student Worksheet | Guide | link |
| 1e | Part 1 Exam | Exam | link |
| 1f | Part 2 Exam | Exam | link |
| 2 | Git Official Book (Pro Git) | Website | link |
| 3 | GitHub Guides | Website | link |
| 4 | Git Cheat Sheet (GitHub Education) | link | |
| 5 | Oh My Git (Interactive Game) | Website | link |
| 6 | A Grip on Git (visual guide) | Website | link |
| 7 | YouTube: Git for Beginners | Video | link |
| 8 | YouTube: Git Tutorial | Video | link |
Videos & Course Material
Grads: add your own video links here via PR! See Contributing.
| Topic | Video | Contributed by |
|---|---|---|
| add topic | add YouTube link | your name |
This post is licensed under
CC BY 4.0
by the author.