How can I resolve conflict on gitlab.com from UI because resolve conflict button is not showing on gitlab.com

manoj.neoarks · February 1, 2020, 1:00pm

I have a project repository on gitlab.com. I have conflict in a branch when merging the branches, But there is no resolve conflict button showing on gitlab.com that’s why I am not able to resolve the conflict. Please help ASAP.

Topic		Replies	Views
List conflicts of a merge request using the API How to Use GitLab	1	1818	May 18, 2021
Merge Conflicts How to Use GitLab	0	413	April 16, 2020
Unable to view "Resolve Conflict" option in Gitlab UI Infrastructure as Code & Cloud Native merge-requests	1	5956	February 9, 2023
Improvements merging conflicts in the web-ui How to Use GitLab web-ui	0	58	July 26, 2024
Is the Merge Conflict Via Online UI Still available and which pricingTier? How to Use GitLab	0	461	May 31, 2018

How can I resolve conflict on gitlab.com from UI because resolve conflict button is not showing on gitlab.com

Related topics