I have a feature branch that I want to merge with master. Before I do that, I would like to squash a few commits. The probleme is that I already did a merge from master onto