On Saturday 17 November 2012, Sebastian Kügler wrote: > > at that point, i will then rebase the integration branch on master and > > re- integrate all branches under review. this will make it a messy > > branch in terms of git history since it will be rebased often; this is > > not a problem as it will never merged back into master. this means *no > > commits* should ever be made directly to the integration branch. only to > > topic branches. > > > > cheers, and best of luck to us all in this new experiment :) > > When is the integration branch updated from the topic branches?
as i understood it, when you do important changes in the topic branch that really may affect the review of the thing, you merge again your topic branch in integration. also, merge only when the topic branch got "good enough for you" ie doesn't have important breakages you know of Cheers, Marco Martin _______________________________________________ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active
