cherry-pick after rebase should get latest changes on feature branch.