Before this change, `Gitlab::Git::Conflict::Resolver#conflicts`
is meant to rescue `GRPC::FailedPrecondition` exception and re-raise
`Gitlab::Git::Conflict::Resolver::ConflictSideMissing`.

That wasn't working though as `wrapped_gitaly_errors` will rescue
it as a `GRPC::BadStatus` exception because that's the parent of
`GRPC::FailedPrecondition`.

That results to MR head diff not showing up when there are
conflicts with missing side.

This fix moves the rescue inside the `wrapped_gitaly_errors`
block so we can rescue appropriately.

Changelog: fixed

Improve some wiki specs

See merge request gitlab-org/gitlab!63150

Remove unused epic related boards code [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63272

Add link to navigate to profile settings page

See merge request gitlab-org/gitlab!62791

Update deprecated GlIcon size in IDE branch search

See merge request gitlab-org/gitlab!62782

Changelog: changed

Refactor AuthorToken to use BaseToken

See merge request gitlab-org/gitlab!63030

Fix loading board lists on big screen size

See merge request gitlab-org/gitlab!63004

Styled the collapsed state of the left sidepanel

See merge request gitlab-org/gitlab!62963

Simplify network policy sidebar

See merge request gitlab-org/gitlab!62134

Move LB calls for API helpers to Core

See merge request gitlab-org/gitlab!62748

Update validation for escalation rule

See merge request gitlab-org/gitlab!62825

Quarantine elastic search qa/specs/features/ee/browser_ui/enablement/elasticsearch/elasticsearch_reindexing_spec.rb

See merge request gitlab-org/gitlab!63114

Move Alert intergrations tab in Operations[RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!62832

The removed codes are no longer used by boards

Delete duplicate `milestone` attribute description

See merge request gitlab-org/gitlab!63265

Rename base class for issue tracker integrations

See merge request gitlab-org/gitlab!63019

Ecosystem: Update usage ping metrics

See merge request gitlab-org/gitlab!63035

Full review of Start using Git on the command line

See merge request gitlab-org/gitlab!62779

Wait for requests when expanding diffs in feature spec

See merge request gitlab-org/gitlab!63239

Enable cross pipeline artifacts download [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63074

Rename repository to repository_deprecated

See merge request gitlab-org/gitlab!63085

Add project topic to graphql

See merge request gitlab-org/gitlab!60397

E2E: Move label migration validation in to existing spec

See merge request gitlab-org/gitlab!62994

Removing reference to renewals@

See merge request gitlab-org/gitlab!63231

Add purgeHTML extractor to fix flakiness

See merge request gitlab-org/gitlab!63263

Add spec for incorrect path parsing when name ends with ref

See merge request gitlab-org/gitlab!62123

The spec to cover the scenario raised in this issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/330947

Add Note about Praefect database tables not being created on initial reconfigure

See merge request gitlab-org/gitlab!62980

Improve DAST introduction

See merge request gitlab-org/gitlab!62852

Add rollover and description to Iteration Cadence form

See merge request gitlab-org/gitlab!62755