github merge options (merge commit vs. rebase-and-merge)