Skip to content

ListConflictFiles: Allow tree conflicts when specified

Patrick Bajao requested to merge pb-list-conflict-files-allow-missing-side into master

In gitlab#281171 (closed), we want to display what type of conflict occurred for a specific file. There are cases that there will be a missing side (e.g. tree-based conflicts like renames) and currently ListConflictFiles RPC only allows returning of conflicts when there is no missing side.

This MR changes ListConflictFiles to accept an AllowTreeConflicts param which will then be set to true on gitlab-rails (draft MR: gitlab!65516 (merged)) when we want to get the list of conflicts.

Relates to gitlab#333687 (closed).

Edited by Patrick Bajao

Merge request reports