--- title: Resolve possible cherry pick API race condition merge_request: author: type: fixed