[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Merge stable to master vs cherry-picking
From:       Glen Ditchfield <GJDitchfield () acm ! org>
Date:       2021-12-03 19:21:28
Message-ID: 2179816.iZASKD2KPV () copperplate
[Download RAW message or body]

I have almost always merged stable to master, following the 
documentation at https://community.kde.org/Infrastructure/
GitLab#Switching_the_target_branch_of_a_Merge_Request

Most of what I do is fixing bugs or warts in PIM, so I debug on the 
release/* branch, and commit there to get the changes out to the users 
in the next release.  I think bug-fixing on master and cherry-picking 
back to release wouldn't work so well.


[prev in list] [next in list] [prev in thread] [next in thread]