We don't squash and we just use plain merges. It gives the real version of what happened. This is what I personally prefer.