You could use `git merge --squash` with Feature Branch or Gitflow. But IMHO it's better not to squash.