> On 27 Mar 2021, at 11:23, Giuseppe D'Angelo via Development > <[email protected]> wrote: > > Hi, > > On 12/03/2021 17:22, Tor Arne Vestbø wrote: >> We we please improve this by: >> 1. Attempt to cherry-pick the commits in the tested branch into dev, before >> falling back to a merge commit (if needed) >> 2. If we need to merge: >> - Reflecting the CI as the author of the merge commit >> - Reflecting the set of commits in the merge commit message, e.g. based >> on git shortlog >> - Using a commit message subject that explains what’s going on, eg. > > This situation is getting a bit out of hand, with a now almost half of > commits in qtbase/dev being merge commits. I'm not quite convinced this is a > good thing.
I agree that it looks messy and shouldn’t be required in 90% of the cases. Let’s try to improve this and cherry-pick where possible, please. Cheers, Lars _______________________________________________ Development mailing list [email protected] https://lists.qt-project.org/listinfo/development
