Octopus Merge
When merging multiple branches at the same time Git may chose to use
the Octopus merge strategy. We can also force the use of this strategy
via the below
git merge -s octopus branch1 branch2
With this type of merge our newly created merge commit will have 3 or
more parents, hence the octopus naming...