[Development] Qt 5.8 branching & Feature Freeze

Edward Welbourne edward.welbourne at qt.io
Mon Jun 27 12:29:34 CEST 2016

Jędrzej Nowacki said (inter alia):
>        Technically waiting for merges is not necessary. Coin is able
> to test arbitrary refs from gerrit, I encourage you to not wait for
> the system, but just make bunch of changes and tests the expected
> combination, before it gets merged from stable branches. You can also
> request a feature branch for testing if you want to work that way. In
> the same time I agree, the merge cycle is too slow, it is just
> annoying. In my opinion the system should automatically create merge
> patches after each successful integration and warn if it was not
> possible because of conflicts. It seems also that I'm extremist in
> that area, but one merge per day seems to be a reasonable compromise.

+1 for regular automated up-merging as often as possible.  We'd still
need to manually resolve conflicts, but this would bring them to light
early and one at a time, which tends to make them easier to resolve !


More information about the Development mailing list