Unable to view "Resolve Conflict" option in Gitlab UI

praseebkdas · February 8, 2023, 10:43am

Hi Team,

We are unable to view the “Resolve Conflicts” option, after performing merge request. Now only option which we can view is " Resolve Locally"

We are using Gitlab 15.7.6 EE version.

paula.kokic · February 9, 2023, 3:54pm

Hey there,

There’s official documentation explaining a few situations when conflict cannot be merged with UI. Please check out following links:

I would highly assume your scenario is one of those.

Best Regards!