On Wednesday, 23 January 2019 11:01:53 PST Volker Hilsheimer wrote: > I think that’s fine. What’s much worse is having a fix in 5.12 and not > knowing how to deal with the merge conflicts into dev. That means dev might > regress, unless whoever authored the change is willing to spend time on > making it work. In the end, if contributors can’t own their changes for all > various branches of Qt, then I much prefer for them to own the changes at > least for dev. And with Qt 6, this will become a much bigger problem.
The problem is I can turn this around and say that we introduce regressions into the older branches due to an improper cherry-pick that didn't conflict. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center _______________________________________________ Development mailing list [email protected] https://lists.qt-project.org/listinfo/development
