Git merge vs. rebase

Git merge vs. rebase