Getting solid at Git merge vs. rebase | Hacker News Reader