Minimizing merge conflicts in squashed branches #1 Post by twolfson » Wed, Aug 12, 2015, 3:20 AM UTC Minimizing merge conflicts in squashed branchestwolfson.com