Re: Merge stable to master vs cherry-picking

2021-12-06 Thread David Jarvie
On 6 December 2021 06:07:50 GMT, Harald Sitter wrote: > I'm all for cherry picking. It's both easier and makes sure fixes are > actually available in master. I like cherry picking since it tends to be more straightforward than merging, but there's always the danger that someone might forget t

Re: Merge stable to master vs cherry-picking

2021-12-06 Thread Albert Astals Cid
El dilluns, 6 de desembre de 2021, a les 7:07:50 (CET), Harald Sitter va escriure: > I'm all for cherry picking. It's both easier and makes sure fixes are > actually available in master. I don't agree that cherry-picking is easier. Example: I want to fix a bug in kmail. Fixing it in master mean

Reminder - Please do not use noreply domains from Gitlab.com/Github.com

2021-12-06 Thread Ben Cooksley
Hi all, A while back Sysadmin encountered a series of issues with the DNS resolvers that support the noreply email addresses offered by one of Github.com/Gitlab.com to their users. These issues led to our hooks refusing to accept the email addresses in commits because the domain does not exist (be