Skip to content

Remove usage of allow_conflicts parameter

John Cai requested to merge jc/remove-merge-to-ref-allow-conflict into master

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.

Edited by John Cai

Merge request reports

Loading