Git - Cherry-Pick and Advanced Merging
You have a project where the same conflict happens often between two branches. How can you use rerere to save time and avoid repeated manual fixes? Choose the best approach.
You have a project where the same conflict happens often between two branches. How can you use rerere to save time and avoid repeated manual fixes? Choose the best approach.
hard📝 Workflow Q15 of 15
Step-by-Step Solution
Solution:
Step 1: Enable rerere globally for all repositories
This ensures rerere is active and can record conflict resolutions anywhere.Step 2: Resolve the conflict once and commit the fix
Rerere records this resolution to reuse it automatically on repeated conflicts.Step 3: Benefit from rerere auto-applying fixes on future merges
This saves time by avoiding repeated manual conflict resolution.Final Answer:
Enable rerere globally, resolve the conflict once and commit, then rerere will auto-apply fixes on future merges. -> Option DQuick Check:
Enable + commit fix = rerere auto-applies [OK]
Quick Trick: Enable rerere, commit fix once, future merges auto-fix [OK]
Common Mistakes:
- Disabling rerere loses automation benefits
- Using rerere only on one branch misses conflicts
- Clearing rerere history removes saved fixes
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