Simplify ConflictsService.ListConflictFiles RPC (!129) · Merge requests · GitLab.org / gitaly-proto · GitLab

This is an archived project. Repository and other project resources are read-only.

Alejandro Rodríguez requested to merge list-conflcits-fix into master Dec 13, 2017

We only actually need one repository to list conflicts, we only need the second repository to resolve conflicts. See also https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15897

This endpoint hasn't been implemented yet, so it's safe to alter it.

Conversation: gitaly#551 (closed)

Edited Dec 13, 2017 by Alejandro Rodríguez