diff options
Diffstat (limited to 'lib/gitlab/gitaly_client/conflicts_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index ffe65307c80..831c5ca1305 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -30,8 +30,8 @@ module Gitlab end def conflicts? - skip_content = Feature.enabled?(:skip_conflict_files_in_gitaly, type: :experiment) - list_conflict_files(skip_content: skip_content).any? + list_conflict_files(skip_content: true).any? + rescue GRPC::FailedPrecondition, GRPC::Unknown # The server raises FailedPrecondition when it encounters # ConflictSideMissing, which means a conflict exists but its `theirs` or |