GitLab - merging fixes from release branch into master

[Konrad Materka]

Hi,

What is the current procedure of merging fixes from release branch
back into master? For example I made a fix for Plasma/5.19 but I want
it in master as well. Merge Request from Plasma/5.19 into master has
conflicts, how to fix them in new GitLab flow?
Sorry if it was discussed already, but I was not able to find any information.

-- 
Regards,
Konrad Materka