Git · Senior · Question 11 of 76
What is an octopus merge?
- 1A merge of eight branches at the same time
- ✓Correct answer: A merge commit with more than two parents
- 3A merge that resolves conflicts automatically
Explanation
Git uses the octopus strategy when you merge several branches at once without conflicts. If there are conflicts it refuses, and you merge them one by one.