FREE COURSE / REAL PRACTICE
Git & collaboration
Work with real repository history: staging, branches, conflicts, remotes, rebase, recovery, worktrees and bisect.
What you’ll work toward
Create reviewable changes, integrate history and investigate mistakes using reproducible repository exercises.
Read an explanation, inspect the diagrams and work through the available checks, debugging exercises and builds. Feedback and prerequisite links guide the next step.
Before you start
The entry lesson has no earlier CodeRigor skill prerequisite. Start there and follow the sequence.
Individual lessons can add prerequisites. The course map shows your actual readiness.
A look inside the first lesson
Snapshots, objects & the first commit
git status --short --branch
git add README.md
git diff --cached
git commit -m "Describe the experiment"
git log --onelineYour course outline
Follow the lessons in curriculum order. Open a unit to preview the ideas you’ll work with.
Git: snapshots, staging & branches
- LESSON 01.01
Snapshots, objects & the first commit
Understand working files, the index, commits and HEAD; record an intentional first snapshot.
Open lesson - LESSON 01.02
Staging, diff, ignore & selective restore
Distinguish staged and unstaged changes, exclude local files, and restore only the state you intend.
Open lesson - LESSON 01.03
Branches, HEAD, tags & history navigation
Create and switch branches, inspect commit ancestry, and distinguish branch names, tags and detached HEAD.
Open lesson
Git: integration & collaboration
- LESSON 02.01
Merges, conflicts & deliberate resolution
Read a three-way merge, resolve the index, and complete or abort the intended operation.
Open lesson - LESSON 02.02
Remotes, tracking, fetch & safe publication
Separate local and remote-tracking refs, publish a topic branch, and reason about rejected updates.
Open lesson
Git: replay, undo & recovery
- LESSON 03.01
Rebase, cherry-pick & reviewable history
Replay unpublished work on a new base, copy an isolated fix, and account for changed commit identities.
Open lesson - LESSON 03.02
Undo, reflog & lost-commit recovery
Undo a shared change with a new commit and recover an unreferenced local tip without destroying later work.
Open lesson
Git: parallel work & regression diagnosis
- LESSON 04.01
Worktrees & parallel branch workflows
Work on separate branches in linked directories while preserving each worktree’s index and local edits.
Open lesson - LESSON 04.02
Regression hunting with log, show & bisect
Narrow a reproducible regression with a good/bad predicate and preserve the history being diagnosed.
Open lesson