Merge Request status is confusing when the diff contents are empty

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Summary

If a merge request diff becomes empty (because the same change was merged through another MR), GitLab reports the MR status as "Merge conflicts must be resolved."

Steps to reproduce

1. Create a first MR with a change, leave it open
2. Create a second MR with the exact same change, merge it

What is the current bug behavior?

The user receives an email that the first MR cannot be merged anymore due to conflicts, creating confusion. The MR page displays the same erroneous message.

What is the expected correct behavior?

The user should receive an email stating that the diff is empty, and that the MR can be closed.

Relevant logs and/or screenshots

Merge page:

User email excerpt:

Merge request !2387 (merged) can no longer be merged due to conflict.