git merge vs rebase

join shbcf.ru