I would prefer cherry-picking since it means less potential for new bugs...