After enabling git rerere and resolving a conflict manually once, what will git status display when the same conflict occurs again during a merge?

medium📝 Command Output Q4 of 15

Git - Cherry-Pick and Advanced Merging

After enabling git rerere and resolving a conflict manually once, what will git status display when the same conflict occurs again during a merge?

ANo conflict markers; the conflict is automatically resolved

BConflict markers remain; manual resolution is required again

CThe merge is aborted automatically

DThe conflicted files are deleted

Step-by-Step Solution

Solution:

Step 1: Recognize rerere's effect
Once rerere records a resolution, it applies it automatically on repeated conflicts.
Step 2: Check git status output
Since the conflict is resolved automatically, git status will still show conflicted files until the merge is completed.
Final Answer:
Conflict markers remain; manual resolution is required again -> Option B
Quick Check:
git status shows conflicts until merge is finalized [OK]

Quick Trick: git status shows conflicts until merge is finalized [OK]

Common Mistakes:

Expecting conflicts to disappear immediately
Thinking merge aborts automatically
Assuming files get deleted

Master "Cherry-Pick and Advanced Merging" in Git

9 interactive learning modes - each teaches the same concept differently

Learn Why Deep Visual Try Challenge Project Recall Time

Want More Practice?

15+ quiz questions · All difficulty levels · Free

Free Signup - Practice All Questions

More Git Quizzes

After enabling git rerere and resolving a conflict manually once, what will git status display when the same conflict occurs again during a merge?

Step 1: Recognize rerere's effect

Step 2: Check git status output

Final Answer:

Quick Check:

Want More Practice?