Support merge strategies except octopus

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>