Minimizing merge conflicts in squashed branches | Hacker News Reader