Sometimes it makes sense to squash down to 2 or 3 commits, particularly with larger branches. Maybe we should reword this it doesn't imply that we should *always* squash down to one commit?