What is a fast-forward merge?easy

Type
conceptual
Topic
merging
Frequency
common
Tags
merging
Answer

A fast-forward merge moves the base branch pointer directly to the tip of the feature branch when no diverging commits exist - no merge commit is created.

Explanation

It is only possible when the base branch has not advanced since the feature branch was created. Use --no-ff to force a merge commit even when a fast-forward is possible, which preserves branch grouping in the log.

Follow-upWhy might you disable fast-forward merges on a protected branch?