Gitlab::Git::Conflict::Resolver::ConflictSideMissing: 9:could not lookup 'our' OID: reference not found.
https://sentry.gitlab.net/gitlab/gitlabcom/issues/3332390/?referrer=gitlab_plugin
GRPC::FailedPrecondition: 9:could not lookup 'our' OID: reference not found.
grpc-1.42.0-x86_64 (linux) src/ruby/lib/grpc/generic/active_call.rb:29:in `check_status'
grpc-1.42.0-x86_64 (linux) src/ruby/lib/grpc/generic/active_call.rb:180:in `attach_status_results_and_complete_call'
grpc-1.42.0-x86_64 (linux) src/ruby/lib/grpc/generic/active_call.rb:169:in `receive_and_check_status'
grpc-1.42.0-x86_64 (linux) src/ruby/lib/grpc/generic/active_call.rb:337:in `each_remote_read_then_finish'
Gitlab::Git::Conflict::Resolver::ConflictSideMissing: 9:could not lookup 'our' OID: reference not found.
lib/gitlab/git/conflict/resolver.rb:23:in `rescue in block in conflicts'
raise Gitlab::Git::Conflict::Resolver::ConflictSideMissing, e.message
lib/gitlab/git/conflict/resolver.rb:21:in `block in conflicts'
gitaly_conflicts_client(@target_repository).list_conflict_files(allow_tree_conflicts: @allow_tree_conflicts).to_a
lib/gitlab/git/wraps_gitaly_errors.rb:7:in `wrapped_gitaly_errors'
yield block
lib/gitlab/git/conflict/resolver.rb:20:in `conflicts'
@conflicts ||= wrapped_gitaly_errors do
lib/gitlab/conflict/file_collection.rb:36:in `files'
@files ||= resolver.conflicts.map do |conflict_file|
...
(176 additional frame(s) were not displayed)
This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.
Edited by 🤖 GitLab Bot 🤖