On Mittwoch, 23. Januar 2019 19:43:06 CET Konstantin Tokarev wrote: > 23.01.2019, 21:38, "Alex Blasche" <[email protected]>: > >> ________________________________________ > >> 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)
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, increasing the number of conflicts that needs to be resolved manually while decreasing the useful information git can give you (no more useful three-way diff). 'Allan _______________________________________________ Development mailing list [email protected] https://lists.qt-project.org/listinfo/development
