[ward]

This uses the so called "octopus" merge strategy in git as described at https://www.kernel.org/pub/software/scm/git/docs/git-merge.h...