When does Git do a fast-forward merge?

Start playing free

  1. When the other branch is far behind
  2. When no work has diverged, so the pointer just moves
  3. When the merge has conflicts

🔒 The answer is for AhaBulb members. Members see the answer, why it's right and the official sources for every card of Stuff Every Technology Expert Should Know, plus timed practice exams.

The first 50 cards of every test are free to play.

Play the free cards See membership

Like this card?
Play the game

References

  1. Pro Git book: Basic Branching and Merging git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging Checked 2026-10-10.

Think this answer is wrong? Tap "Challenge this answer" on the card in the game and tell us why.

Test yourself in the game