i always squash my commits when merging a feature branch. i don't need all the frivolous commits i've made while saving my progress.