Proposal: switch to the cherry-pick backwards workflow
Historically, Dolphin has used a workflow whereby merge requests/commits are landed on either the master branch or the stable branch, and if the target was the stable branch because it was a bugfix, that branch is merged forward into master.
A few years ago, Plasma moved to a different workflow whereby all merge requests/commits are landed on the master branch, and cherry-picked backwards into the stable branch as needed. Having used both approaches for a few years, I find that overall the cherry-pick workflow seems to reduce friction:
- No more asking the submitter to change the target branch of their MR if it's a bugfix
- No more manual merging, which means no more annoying merge conflicts in the
CMakeLists.txt
file after every branching event - You can cherry-pick right form the GitLab web UI, which is nice and fast and you don't have to leave the website after merging using the website
I'd like to formally propose that we adopt it in Dolphin.
@elvisangelaccio is the formal maintainer, but has not been active recently, so I'm also CCing the top five contributors by number of lines added over the past year (according to GitHub, which has better tools for visualizing this compared to GitLab): @alex @broulik @felixernst @epopov @cblack
What say ye?