Git merge vs git rebase: avoiding rebase hell | Hacker News Reader