Re: Gitlab merge workflow: reverse it?

2020-06-25 Thread Aleix Pol
On Thu, Jun 25, 2020 at 7:49 PM David Edmundson wrote: >> You have this button from commit page, not merge request page. >> >> https://i.imgur.com/9kgdpVy.png > > > Found it, that's perfect thanks. > > That's also a useful feature in the current workflow. > Seems you can cherry-pick a commit in a

Re: Gitlab merge workflow: reverse it?

2020-06-25 Thread David Edmundson
> You have this button from commit page, not merge request page. > > https://i.imgur.com/9kgdpVy.png Found it, that's perfect thanks. That's also a useful feature in the current workflow. Seems you can cherry-pick a commit in a work/branch to a new merge request. > If you use git cherry-pick w

Re: Gitlab merge workflow: reverse it?

2020-06-25 Thread Bhushan Shah
Hello! On Thu, Jun 25, 2020 at 03:59:10PM +0100, David Edmundson wrote: > Gitlab supposedly has a magic button for it just after a commit has landed > in master. > https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html > > Though I don't know how to trigger that in our UI

Re: Gitlab merge workflow: reverse it?

2020-06-25 Thread David Edmundson
On Thu, Jun 25, 2020 at 3:46 PM Bhushan Shah wrote: > Hello everyone! > > This is a proposal to change our workflow regarding release branches and > our merge workflow, > > # Current workflow > > - Current workflow is that we commit to stable branch and then merge it > upwords until master bran

Gitlab merge workflow: reverse it?

2020-06-25 Thread Bhushan Shah
Hello everyone! This is a proposal to change our workflow regarding release branches and our merge workflow, # Current workflow - Current workflow is that we commit to stable branch and then merge it upwords until master branch - i.e commit to Plasma/5.18 branch, merge 5.18 into 5.19 and then