On Wednesday, November 14, 2012 16:08:31 Aaron J. Seigo wrote: > hello ... > > so i *finally* got around to creating the integration branch in > plasma-mobile. > > from this point forward, only peer reviewed bug fixes and obvious, can't-be- > wrong trivial fixes should be pushed into master. > > ALL other activity must occur in topic branches. once the branch is ready to > be pushed, create a review request on reviewboard.kde.org and after initial > review, i will merge it into the integration branch. > > topic branches should be started from the master branch. > > all pre-release testing should be done using the integration branch. > > every monday, all topic branches will be merged into master that have: > > * successfully been merged in the integration branch > * have been tested and peer reviewed with an explicit +1 from at lesat one > other core developer and/or tester > > 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? -- sebas http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9 _______________________________________________ Active mailing list Active@kde.org https://mail.kde.org/mailman/listinfo/active