Check for cherries before cherry-picking