Test Git Merge vs Rebase