I only cherry-pick when it's the only commit of a feature branch that's going to be removed anyways. If development continued in that branch, I would merge mas

I only cherry-pick when it's the only commit of a feature branch that's going to be removed anyways. If development continued in that branch, I would merge master back into the feature branch again, or rebase the feature branch on master. Not sure why, but I always knew from the beginning that cherry-picking is something not to be done from a live in-development feature branch without taking steps afterwards.