How to select merge changes in gitlab

user_16249829 0
Viewed 16

I have a pending merge request and I am attempting to merge 2 branches via gitlab. I can see changes but there is no option for me to accept which change I would like to have: enter image description here

Could someone clarify to me how do I accept the changes that I want when merging via gitlab?

gitlab
1 Answers

What you see is probably a diff view, not a merge view.

If there are conflicts, you should see a "Resolve conflict" in the MR page.

https://docs.gitlab.com/ee/user/project/merge_requests/img/merge_request_widget.png

That should open a view with a "use this" button for you to chose one side or the other.

https://docs.gitlab.com/ee/user/project/merge_requests/img/conflict_section.png

VonC_63090
Related