[Development] Proposal: New branch model

[Konstantin Tokarev]

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