GitLab - merging fixes from release branch into master
Nate Graham
nate at kde.org
Sun May 24 19:16:46 BST 2020
Land it on Plasma/5.19, then manually merge Plasma/5.19 into master,
same as before.
This information is at
https://community.kde.org/Infrastructure/Phabricator; I will migrate the
relevant section to https://community.kde.org/Infrastructure/GitLab today.
Nate
On 5/24/20 11:41 AM, Konrad Materka wrote:
> 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.
>
More information about the Plasma-devel
mailing list