[Development] Proposal: New branch model

[Edward Welbourne]

23.01.2019, 21:38, "Alex Blasche" <alexander.blasche at qt.io>:
>>> At the end of the day each cherry-pick is a merge too

Merges and cherry-picks have a certain amount in common, but they are
not the same thing at all.

>>> 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.

This is true.

On Mittwoch, 23. Januar 2019 19:43:06 CET Konstantin Tokarev wrote:
>> 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)

Allan Sandfeld Jensen (23 January 2019 23:05)
> More than that. Once you have had cherry-pick only for a while git will be
> unable to find useful common ancestors for the changes, and will be unable to
> do smart three-way merging of cherry-picks,

OK, now you're just engaging in ill-informed FUD.
Cherry-picks do not involve any three-way anything.
You clearly do not understand the difference between merging and
cherry-picking.

A cherry-pick takes the diff involved in one commit and patches another
check-out with it.  A merge uses the digraph of commits in sophisticated
ways; a cherry-pick does not.

	Eddy.