Increased rates of rebase error: this patch has already been applied

https://sentry.gitlab.net/gitlab/gitlabcom/issues/3090815/?referrer=gitlab_plugin

Gitlab::Git::Repository::GitError: rebase: commit "08e95cd8d1fd20986e510c77b74ff72d44b84f9f": conflicts have not been resolved
  lib/gitlab/gitaly_client/operation_service.rb:402:in `perform_next_gitaly_rebase_request'
    raise Gitlab::Git::Repository::GitError, response.git_error
  lib/gitlab/gitaly_client/operation_service.rb:254:in `rebase'
    perform_next_gitaly_rebase_request(response_enum) do |response|
  lib/gitlab/git/repository.rb:882:in `block in rebase'
    gitaly_operation_client.rebase(
  lib/gitlab/git/wraps_gitaly_errors.rb:7:in `wrapped_gitaly_errors'
    yield block
  lib/gitlab/git/repository.rb:881:in `rebase'
    wrapped_gitaly_errors do
...
(93 additional frame(s) were not displayed)