Minimizing merge conflicts in squashed branches | Dark Hacker News