Git Merge vs. Rebase
- both serve the purpose of integrating one branch into another
- merge creates a merge commit with all changes (easy & safe to use)
- rebase moves all commits on the tip of the other branch (good to keep git history linear & clean)