What does this MR do?
Related to: #232484 (closed)
gitaly!2626 (merged) introduced a new param to
UserMergeToRef RPC which allows us to create
merge-ref-head even though there are conflicts. Those conflicts will be merged in the diff with markers and we'll be able to highlight the conflicted block. Something like: