Question: what is the difference between rebase and merge?
Answer: git — Rebase vs Merge. Rebasing and merging are both designed to integrate changes from one branch into another branch but in different ways. When you do rebase a feature branch onto master, you move the base of the feature branch to master branch's ending point. ... Merging adds a new commit to your history.