Find the perfect coding resourcesLearn more

Learn Git 2

Boot.devBoot.dev
Recommended
Meet Your Instructor
ThePrimeagen avatar

ThePrimeagen

Instructor

ThePrimeagen is a popular software engineer, content creator, and educator known for his expertise in Vim, Git, and software development. He creates educational content on YouTube and Twitch, and is passionate about teaching developers efficient coding practices and tools.

12 hours

Completion

Certificate included

Format

Interactive coding

Freemium

What You'll Learn

Resolve merge and rebase conflicts professionally

Master advanced Git commands like cherry-pick and bisect

Use stash and worktrees for parallel development

Squash commits and maintain clean project history

Recover lost commits with reflog

Overview

The second installment of our complete Git course. In this advanced course you'll learn how to use Git to collaborate on teams of developers. We will focus a lot more on conflicts and how to safely resolve and revert the natural issues that arise when working on large software teams.

Table of Contents
1
Fork

Learn how to fork a repository and contribute to open source projects

2
Reflog

Work with the reference log to recover lost commits

3
Merge Conflicts

Understand merge conflicts, how they arise, and how to resolve them

4
Rebase Conflicts

Learn about rebase conflicts and how to safely keep the project history clean

5
Squash

Many teams require developers to squash commits, learn how and why you would do it

6
Stash

You don't always need to use branches to work on multiple things at once, learn how the stash can save time

7
Revert

Git reset is a bit of a blunt tool, learn about git revert and how to safely undo changes

8
Cherry Pick

Use git cherry pick to selectively move changes from one branch to another

9
Bisect

Slogging through git history can be time consuming, learn how git bisect can find bugs fast

10
Worktrees

Learn when git worktrees can be better than regular old branches when it comes to parallel development

11
Tags

Learn how to use git tags properly to version and release your code

Share Your Experience

Sign in to leave a review and help others

No reviews yet. Be the first to review!