Migrates the "Resolve conflict" button in the diff view
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:
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.