GitLab dev to qa merge conflict with no resolution options can occur on multiple different occasions. One of the main reasons You can run into is : You can still check it out locally. The merge request You will be able to see and resolve in intellij or command line, whatever You fancy. At least you will be able to pull and just use the things that causes the conflic from QA. Unfortunetly it might require You to work on some changes again. For more stability i would do it one branch after the other so gitlab will not have issues when we first merge everything from QA using qa…