After merging a feature branch into main using git merge --no-ff, what will the commit history show?

medium📝 Predict Output Q5 of 15

Git - Rebasing

After merging a feature branch into main using git merge --no-ff, what will the commit history show?

AA linear history with feature commits directly on main

BA merge commit connecting feature branch commits to main

CFeature branch commits deleted from history

DMain branch reset to feature branch state

Step-by-Step Solution

Solution:

Step 1: Understand --no-ff merge
The --no-ff flag forces creation of a merge commit even if fast-forward is possible.
Step 2: Identify commit history effect
This results in a merge commit connecting feature branch commits to main, preserving branch structure.
Final Answer:
A merge commit connecting feature branch commits to main -> Option B
Quick Check:
--no-ff creates merge commit = B [OK]

Quick Trick: Use --no-ff to keep merge commits [OK]

Common Mistakes:

Master "Rebasing" in Git

9 interactive learning modes - each teaches the same concept differently

Want More Practice?

15+ quiz questions · All difficulty levels · Free

More Git Quizzes