3 ms·Git merge vs git rebase: avoiding rebase hell13 points by jtms 17y agoThorough explanation of the difference between a merge and a rebase along with some nice diagrams.