Git · Senior · Question 44 of 76
What is a criss-cross merge history?
- 1A merge where files were renamed on both sides
- ✓Correct answer: Two branches merged into each other, so several bases
- 3A history in which every single commit has two parents
Explanation
With more than one best common ancestor, Git's recursive or ort strategy first merges the bases into a virtual base. It's one reason to avoid merging branches back and forth.