Rebase \ Merge

Rebase and merge are two different strategies used to integrate changes from one branch into another