Git squash without repetitive conflicts | Hacker News Reader