require retry when manual fix of cherry-pick doesn't result in a clean tree