Revert "Merge branch '4576-reimplement-listconflictfiles-with-git-merge-tree-2' into 'master'" (!5840) · Merge requests · GitLab.org / gitaly · GitLab

Karthik Nayak requested to merge revert-git-merge-tree into master May 25, 2023

This reverts commit 624fc009, reversing changes made to 32b10cf8.

Reverts MR: !5734 (merged)
Failed Pipeline: https://gitlab.com/gitlab-org/gitlab/-/pipelines/874191153
Failed RSpec: https://gitlab.com/gitlab-org/gitlab/-/jobs/4322839516

Opens #4576 (closed)

Edited May 25, 2023 by Karthik Nayak