🌳 Branching & Merging

Master Git's branching workflow and collaboration features

Git Branch

Beginner 10 minutes

Learn the basics of branching in Git. This lesson will guide you through creating a new branch, checking out a branch, and merging a branch.

Start Lesson

Merge Strategies

Intermediate 15 minutes

Understand the different Git merge modes and in which situation Git uses which one. Learn about different merge strategies and how to control merge behavior.

Start Lesson

Git Rebase

Intermediate 12 minutes

Learn how to use git rebase to maintain a clean, linear history. This lesson covers rebasing feature branches onto main, fast-forward merges, and the benefits of rebasing over merging.

Start Lesson

Git Interactive Rebase

Intermediate 20 minutes

Learn how to use interactive rebase to maintain a clean history. This lesson covers interactively rebasing branches, how to not clutter the history with commits without any value by them selves.

Start Lesson

Autosquashing

Advanced 20 minutes

Learn how to use git commit --fixup and --squash to create commits that can be automatically combined with previous commits during interactive rebase. This helps maintain a clean commit history.

Start Lesson

Git Worktree

Intermediate 12 minutes

Learn how to work with multiple branches at the same time using git worktree. This powerful feature allows you to have multiple working directories for the same repository, making it easy to switch between branches, even if you have local changes.

Start Lesson