Skip to content

Migrates the "Resolve conflict" button in the diff view

Marcel van Remmerden requested to merge migrate-resolve-conflict-diff into master

What does this MR do and why?

Migrates the "Resolve conflict" button in the diff view from deprecated info to confirm variant. No visual change, so only pasting a screenshot of the button here:

image

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Merge request reports