[Solved] What does the --no-ff option do when merging branches in Git? — Ans: It creates a merge commit even if a fast-forward merge is possible. | Git

Git - Cherry-Pick and Advanced Merging

What does the --no-ff option do when merging branches in Git?

AIt creates a merge commit even if a fast-forward merge is possible.

BIt squashes all commits into one before merging.

CIt deletes the source branch after merging.

DIt aborts the merge if conflicts are found.

Step-by-Step Solution

Solution:

Step 1: Understand fast-forward merges
A fast-forward merge moves the branch pointer forward without creating a new commit if no divergent changes exist.
Step 2: Effect of --no-ff
The --no-ff option forces Git to create a merge commit even if a fast-forward is possible, preserving branch history.
Final Answer:
It creates a merge commit even if a fast-forward merge is possible. -> Option A
Quick Check:
--no-ff keeps history with merge commit [OK]

Quick Trick: Remember: --no-ff always makes a merge commit [OK]

Common Mistakes:

Master "Cherry-Pick and Advanced Merging" in Git

9 interactive learning modes - each teaches the same concept differently

More Git Quizzes

What does the --no-ff option do when merging branches in Git?