Skip to content

conflicts: Add new field `skip_content_parsing`

Karthik Nayak requested to merge kn-408142-list-conflict-files into master

The ListConflictFiles RPC merges the provided tree-ish objects and returns the conflicted files along with their contents. Sometimes, we don't really care about the content of the conflicted files (for e.g. merge compatibility checks in CI/CD pipelines).

Parsing file contents and streaming them is a laborious process and slows down the RPC. We should allow the clients to decide if they really need the contents of the conflicted files. The new fields will help us implement the functionality where the RPC would simply check for conflicts and return the conflicted filenames without the contents.

More information: gitlab#408142 (comment 1465052566)

Note: We don't have to worry about backward compatibility regarding the release of the proto gem and the implementation in Gitaly within the same milestone as this feature default false. The rails implementation will have to wait for the next milestone.

Edited by Karthik Nayak

Merge request reports