[nlawalker]

Now I'm confused... is that not what the author is doing?

>> 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'?

[fredrikmorken]

Author of the article here. Yes, this is what I am describing. Sir_Cmpwn is describing the same workflow as I am.