[Development] Proposal: New branch model

[Martin Smith]

I understand cherrypicking can result in conflicts, but surely changing to this new model would also require changing the rules.

I would expect that for a particular patch to dev, a decision would be made to determine which released versions the patch should be cherrypicked to.

Then the person who patches dev will cherrypick his  change to those versions himself and fix the conflicts.

________________________________________
From: Development <development-bounces at qt-project.org> on behalf of Konstantin Tokarev <annulen at yandex.ru>
Sent: Wednesday, January 23, 2019 7:43:06 PM
To: Alex Blasche; development at qt-project.org
Subject: Re: [Development] Proposal: New branch model



23.01.2019, 21:38, "Alex Blasche" <alexander.blasche at qt.io>:
>> ________________________________________
>> From: Martin Smith
>> If you make all patches in dev and then cherrypick them back to earlier versions that need them, why would you ever do a merge?
>
> At the end of the day each cherry-pick is a merge too and they can conflict too. The conflict resolution process is still the same. if everything is conflict free then a git merge would be no more difficult than a cherry-pick.

And when conflicts are present, cherry-picking N patches may result in N times
more work than merge in worst case (and same amount of work in the best case)

--
Regards,
Konstantin

_______________________________________________
Development mailing list
Development at qt-project.org
https://lists.qt-project.org/listinfo/development