Problem Statement
What is an octopus merge and when is it appropriate?
Explanation
An octopus merge merges more than two branches in a single commit. It’s suitable for merging many independent topic branches without conflicts; avoid when manual conflict resolution is required.
Practice Sets
This question appears in the following practice sets: