Git · Junior · Question 20 of 75
What is a fast-forward merge?
- 1Merging only the most recent commit of the other branch
- ✓Correct answer: Moving the branch pointer ahead when there are no divergent commits
- 3Merging that skips conflict checks to save time
Explanation
If main hasn't moved since feature branched off, merging just moves main to feature's commit, with no merge commit. --no-ff forces a merge commit anyway.