19 Rebase, then fast-forward

19 / 33

Goal

Get feature's commits onto main as a straight line, with no merge commit.

Many teams keep main as one straight line. The recipe: rebase the feature onto main, so it sits directly on top, then merge it — and because main is now simply behind, the merge is a fast-forward.

git rebase main feature is a shortcut for switching to feature and rebasing it onto main in one go.

Try it

Land the avatars feature on main without a merge commit.

Go to the terminal

Hint

Rebase feature onto main, then switch to main and merge feature — it'll fast-forward.

Show a solution

git switch feature
git rebase main
git switch main
git merge feature

This interactive environment needs JavaScript. Everything you need to read is on this page, and the solution works the same way for real.

Git

Starting Git…