Toggle conflict resolution in ui (!16693) · Merge requests · GitLab.org / GitLab · GitLab

The source project of this merge request has been removed.

What does this MR do?

Replaced CE MR gitlab-foss!31373 (closed)

Address CE issue gitlab-foss#24857 (moved) #16538 (closed)

Edited Jul 11, 2020 by Lee Tickett