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