Skip to main content

Git branches, merging and rebasing

Create and switch branches, merge them back, resolve a merge conflict, and choose between merge and rebase on a team.

Beginner 3 · Data and toolsabout 2 hours5 sections

Quick answer

A Git branch is a movable label on a line of commits. You build a change on a branch, then merge it back, which joins histories, or rebase it, which replays your commits on top.

Why it matters

Every team works in branches. Interviewers and teammates expect you to keep main working, resolve conflicts without panic, and know when a rebase is safe and when it is not.

Sign up free to read the whole lesson

The rest of this lesson: 5 parts, video lessons, the best course, practice and a quick check. It is free, takes a few seconds and needs no card.

Accounts are for learners aged 18 and over. Under 18? The quick answer and the first part of every lesson stay open: browse lessons by topic.

Software engineeringBeginner 3: Data and toolsVideo lessonsBranchMerge conflictRebase

Track

Today's AI turns are used

Lessons, roadmaps, videos, practice cards and the code playground stay free with your account, with no limit.