--- title: Improve fast-forward merge is not possible message merge_request: 22834 author: Ben Bodenmiller type: other