Understanding Git: Merge vs. Rebase