Learn to work confidently with Git branches — understanding them as lightweight movable pointers, creating and switching between them, and merging your work back together. You will resolve merge conflicts calmly, choose between rebase and merge, stash work in progress, and cut tagged releases, so you can honestly say you work confidently with branches on any team.
Watch the free preview
What a branch really is — free to watch, no account needed.
What you'll learn
- Work confidently with branches as movable pointers to commits
- Create, switch and delete branches with switch, checkout and branch
- Merge branches and explain fast-forward versus three-way merges
- Resolve merge conflicts calmly and verify the result before committing
- Choose between rebase and merge, stash work, and cut tagged releases
Syllabus
Branches as Pointers
What a branch really isFree preview
Creating and switching branches
Merging Branches
Fast-forward merges
Three-way merges
Conflicts, Rebase and Stashing
Resolving merge conflicts
Rebase versus merge, and stashing
Tags, Releases and Workflow
Tags and releases
A confident branching workflow
Lab — 10 Exercises & Solutions
Exercises 1–5
Exercises 6–10