Skip to content

Make sure ConflictsService does not raise for conflicting submodules

Sean McGivern requested to merge fix-conflicts-exception-for-submodules into master

What does this MR do?

Treats all GRPC exceptions when checking for conflicts as if there are conflicts.

Are there points in the code the reviewer needs to double check?

This is probably not going to work in all cases, but if the specs pass, then we don't know about the other cases.

Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/issues/48881 is a regression.

Merge request reports