>> the feature branch is reset to master, after which the commits are re-applied on top of feature
Is that not rebasing 'feature' on top of 'master'?