If the original author of a change was not also on the reviewer list, the Cherry-pick bot will fail to add the user to the attention set of a new cherry-pick which has merge conflicts.

The original author should always be added to the reviewer set before attempting to flag them for attention