rework cherry-pick logic
will throw an exit status of 1 if the cherry-pick failed