What is the difference between a "fast-forward merge" and a "three-way merge"?
Correct! Well done.
Incorrect.
The correct answer is A) A fast-forward merge happens when the target branch's pointer can simply move to the source commit via a direct linear path, while a three-way merge is needed when both branches diverged, requiring a new commit combining changes from both
Correct Answer
A fast-forward merge happens when the target branch's pointer can simply move to the source commit via a direct linear path, while a three-way merge is needed when both branches diverged, requiring a new commit combining changes from both
When no merge commit is needed (fast-forward), the branch pointer simply advances; "git merge --no-ff" can force a merge commit even when a fast-forward would otherwise be possible, preserving feature-branch context in history.