This image shows the Cherry-Pick dialog when there's a conflict, with a message that the revision was applied to the branch but the conflicts is yet to be resolved.