What is the difference between rebasing and merging the base branch with the feature branch?