cherry-pick/revert: advise using --skip