Branching Fundamentals
Understand Git branches — creating, switching, listing, and deleting branches. Learn the mental model that makes branching intuitive.
Merge Strategies
Understand fast-forward, three-way, and squash merges — when to use each, how they affect your history, and how to perform them.
Rebase Explained
Understand git rebase — how it works, when to use it vs merge, interactive rebase for cleaning up commits, and the golden rule of rebasing.
Conflict Resolution
Understand why merge conflicts happen, how to read conflict markers, and systematic techniques for resolving them confidently.