[Solved] When should you prefer git rebase over git merge in a collaborative project? — Ans: To keep a clean, linear history before merging a feature branch | Git

Git - Rebasing

When should you prefer git rebase over git merge in a collaborative project?

ATo delete a branch after merging

BTo combine multiple branches into one without changing history

CTo keep a clean, linear history before merging a feature branch

DTo create a new branch from the current branch

Step-by-Step Solution

Solution:

Step 1: Understand the purpose of git rebase
Git rebase rewrites commit history to create a linear sequence of commits, which helps keep history clean.
Step 2: Compare with git merge in collaboration
Git merge preserves all commits and creates a merge commit, which can clutter history. Rebase is preferred before merging to main to avoid this.
Final Answer:
To keep a clean, linear history before merging a feature branch -> Option C
Quick Check:
Rebase for clean history = D [OK]

Quick Trick: Use rebase to tidy history before merging [OK]

Common Mistakes:

Master "Rebasing" in Git

9 interactive learning modes - each teaches the same concept differently

More Git Quizzes

When should you prefer git rebase over git merge in a collaborative project?