Git Merge vs. Rebase

Merge

Rebase