Skip to content

conflicts: Use quarantined repo for conflict detection

Xing Xin requested to merge blanet/gitaly:xx/use-quarantined-repo-for-conflict-detection into master

New blobs and trees would be written to repository by git-merge-tree during conflict detection. But ListConflictFiles is an ACCESSOR indeed and new objects generated has no meaning for further usage. So let's use a quarantined repo to cleanup them after the RPC finished.

Merge request reports