11.04.2017, 15:45, "Ville Voutilainen" <ville.voutilai...@gmail.com>: > On 11 April 2017 at 15:16, Marc Mutz <marc.m...@kdab.com> wrote: >> On Tuesday 11 April 2017 13:49:01 Ville Voutilainen wrote: >>> You say we discourage cherry-picking. Why? Is that not a fairly >>> natural way to backport >>> bugfixes from a bleeding-edge branch to a stabler branch? >> >> Afaict, it's because it's against the workflow of the RCS. > > So, we think it's better to forward-merge everything from stable to > dev, rather than > cherry-pick from dev to stable?
In git cherry-picking results in duplication of commits between branches, that have similar content but different hashes. Also, in case of conflicts merge can result in way less work than cherry-picking, as in O(N) vs O(1) > >> Are you proposing a everything-to-dev-cherry-pick-into-older-branches-only >> model? > > I'm not proposing it yet, but such models seem plenty attractive to me. > _______________________________________________ > Development mailing list > Development@qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Regards, Konstantin _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
