Git
Commits, branches, merges, conflicts. Less about how to push code, more about how to read someone else's history.
Basics
Version control through a thesis example. How a commit differs from a folder of archives.
init, add, commit, status, log. Why you need .gitignore.
branch, switch, checkout. The feature-branch workflow, short and visual.
What merge does, what rebase does, when to pick which, and why you don't rebase public history.
What <<<<<<< and >>>>>>> mean, how to resolve them by hand, abort and continue.
Six questions on the core commands and concepts. Closes out the track.
Team workflow
What the numbers in version 2.4.1 mean: MAJOR.MINOR.PATCH, dependency ranges and the link to git tags.
Lightweight vs annotated tags, how to tag a version, push a tag, and what a release is built from.
Two branching models: heavyweight git-flow and trunk-based with feature flags. When to use which, and why.