Hello,
On Mon, Jun 29, 2020 at 12:36:50PM +0200, Marco Martin wrote:
> There was some discussion about it in the monday meeting.
> Decision was to try and go for it, but at the same time propose it in
> kde-core-devel as well as a global policy
I will propose this to kde-core-devel.
I wonder if
There was some discussion about it in the monday meeting.
Decision was to try and go for it, but at the same time propose it in
kde-core-devel as well as a global policy
On Thu, Jun 25, 2020 at 4:46 PM Bhushan Shah wrote:
>
> Hello everyone!
>
> This is a proposal to change our workflow
I'm in favor of merging to master first. It's just easier for me to
work that way because the cherry picking is something I can just add
on top of my normal git workflow instead of having to remember a
different git workflow for situations where we may want to patch a
stable branch.
On Thu, Jun
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
> 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
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
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
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
