Skip to content

Prevent requesting for conflicts when MR can be merged

Patrick Bajao requested to merge pb-conflicts-cannot-be-merged-only into master

What does this MR do and why?

When a MR can be merged, it means there are no conflicts. To avoid making a Gitaly call in that case, we return early.

This is behind display_merge_conflicts_in_diff feature flag. See [Feature flag] Enable display_merge_conflicts_i... (#276918 - closed).

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Peter Leitzen

Merge request reports