new post: Merge vs. rebase