What you're describing is just doing a 'squash' merge