Skip to content

Disable resolve conflicts for protected branches

What does this MR do?

Disables resolve conflicts button when resolving conflicts onto protected source branch.

Screenshot_2018-12-17_at_13.33.21_1

What are the relevant issue numbers?

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463

Does this MR meet the acceptance criteria?

Edited by Phil Hughes

Merge request reports