GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing sidefix/gitaly-can-be-merged-for-missing-conflict-files

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb
index 2565d537aff..e14734495a8 100644
--- a/lib/gitlab/gitaly_client/conflicts_service.rb
+++ b/lib/gitlab/gitaly_client/conflicts_service.rb
@@ -25,6 +25,11 @@ module Gitlab
 
       def conflicts?
         list_conflict_files.any?
+      rescue GRPC::FailedPrecondition
+        # The server raises this exception when it encounters ConflictSideMissing, which
+        # means a conflict exists but its `theirs` or `ours` data is nil due to a non-existent
+        # file in one of the trees.
+        true
       end
 
       def resolve_conflicts(target_repository, resolution, source_branch, target_branch)