git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge