Git - Cherry-Pick and Advanced Merging
Which merge strategy creates a new commit even if a fast-forward merge is possible?
Which merge strategy creates a new commit even if a fast-forward merge is possible?
easy📝 Conceptual Q2 of 15
Step-by-Step Solution
Solution:
Step 1: Identify merge strategies
Fast-forward merges move the branch pointer without creating a new commit if possible. No fast-forward forces a new commit.Step 2: Understand the difference
Squash merges combine commits into one but do not preserve history as a merge commit. Rebase rewrites history.Final Answer:
No fast-forward merge -> Option CQuick Check:
New commit forced = No fast-forward merge [OK]
Quick Trick: Use --no-ff to force a merge commit [OK]
Common Mistakes:
- Confusing fast-forward with no fast-forward
- Thinking squash creates merge commits
- Mixing rebase with merge commits
Master "Cherry-Pick and Advanced Merging" in Git
Want More Practice?
15+ quiz questions · All difficulty levels · Free
Free Signup - Practice All QuestionsMore Git Quizzes