--- title: Improve error handling of squash and rebase merge_request: 23740 author: type: other