Question: what is the difference between git merge and git rebase?
Answer: When you do rebase a feature branch onto master, you move the base of the feature branch to master branch's ending point. Merging takes the contents of the feature branch and integrates it with the master branch. As a result, only the master branch is changed. The feature branch history remains same.