Skip to content
Log in
Back to course

Merging on GitHub: merge commit, squash and merge, rebase

What merging does, the three options behind GitHub's merge button (merge commit, squash and merge, rebase and merge) and what each leaves in the history, a fast-forward merge in plain words, and how to check whether a change is really in main.

Lesson 5 of 15~32 min of learningIncludes ~15 min for questions and tasks

Read the theory (9 cards)
Three small panels, each showing a side line joining the main line differently: through a knot, squeezed into one orange circle, or laid in a straight row.