MR - Conflict

Describe your question in as much detail as possible:
People, recently I’ve updated my Gitlab instance from 11.11.2 to 12.6.4. After that the merge requests are showing that there are conflicts and the merge cannot be done, like in the image attached. But those MRs there are no conflicts at all. When a conflict really happens it shows the button to ‘resolve conflicts’.

  • What are you seeing, and how does it differ from what you expect to see?
    I expected to see the diff showing line by line or side by side or when there are no conflicts with the merge button to be enabled.

  • Consider including screenshots, error messages, and/or other helpful visuals

  • What version are you on (Hint: /help) ? and are you using self-managed or gitlab.com?
    Self-managed updated version from 11.11.2 to 12.6.4

  • What troubleshooting steps have you already taken? Can you link to any docs or other resources so we know where you have been?
    Only old issues from 2016 that looked like the same but discarded due to being old


looks like the case…