Remove usage of allow_conflicts parameter
What does this MR do and why?
Remove usage of allow_conflicts parameter
merge_to_ref's allow_conflicts parameter already defaults to false, and is no longer going to be used going forward. Let's remove references to it.
gitaly#5349 (comment 1436918933) details the decision to remove this parameter.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Edited by John Cai