Add post: rebasing vs merging