Merge conflicts message isn't displayed when diff_head param isn't passed (#287919) · Issues · GitLab.org / GitLab · GitLab

Merge conflicts message isn't displayed when diff_head param isn't passed

The project has `default_merge_ref_for_diffs` enabled. This merge request has conflicts: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22505/diffs, `master (base)` version is displayed, but there's no message ![merge_ref_head_with_conflicts_message_v13_7](https://gitlab.com/gitlab-org/gitlab/uploads/ab51344b2449826cb3fb1f6135a7f08f/merge_ref_head_with_conflicts_message_v13_7.png) One of the possible solutions would be to check here whether `default_merge_ref_for_diffs` FF is enabled: https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/javascripts/diffs/components/app.vue  *This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.*

issue