Getting solid at Git merge vs. rebase
medium.com