I would see the biggest long term impact with the massive amount of cherry picks from dev to qt6 over a long period of time.
Git rerere works locally, so it doesn’t help in this setup I think. Simon > On 24. Jan 2019, at 15:28, Jedrzej Nowacki <jedrzej.nowa...@qt.io> wrote: > > Dnia środa, 23 stycznia 2019 23:05:17 CET Allan Sandfeld Jensen pisze: >> 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 > > Good point, that is a risk. Question is how big it is. Does it really affect > us, as old branches over time should be modified less and less. Are there > tooling like git rerere able to help us? > > Cheers, > Jędrek > > > _______________________________________________ > Development mailing list > Development@qt-project.org > https://lists.qt-project.org/listinfo/development _______________________________________________ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
