git merge vs git rebase

Прелесть какая:

comments powered by Disqus