How Git rebase conflicts work | Hacker News Reader