{section: Active source code release branches, or where should my code go?} -*: {strike}Code that implements new features or non-urgent bug fixes, aka code targeted for v8.0.1, should go into branch *master*.{endstrike} +*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.1.0, should go into branch *master*. -*: Code that implements new features should stay in work branches until after the 8.0.0 release branch has been created. You _should_ be working on stabilizing 8.0.0 rather than new features! +*:{strike}Urgent bug fixes go into *V8_1_0-branch, but only with permission of the wrangler*. They should then be merged into *master*.{endstrike} -*:{strike}Urgent bug fixes go into *V7_9_6-branch, but only with permission of the wrangler*. They should then be merged into *master*.{endstrike} +*: Serious bug fixes to stable series features should go into *V8_0-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into {strike}*V8_1_0-branch* with permission of the wranger,and/or {endstrike} *master*, as above. -*: Serious bug fixes to stable series features should go into *V7_8-branch*. _ALL COMMITS TO A STABLE BRANCH {wiki: PerformingCodeReviews MUST BE CODE REVIEWED}_ - the ticket should show who did the code review. Commits should then be merged into {strike}*V7_9_6-branch* with permission of the wranger,and/or {endstrike} *master*, as above. - -*: {strike}Very Very Urgent bug fixes to old features might go into *V7_8_9-branch*, but only with permission from the wrangler, and merge from there into *V7_8-branch*, following rules above.{endstrike} +*: {strike}Very Very Urgent bug fixes to old features might go into *V8_0_0-branch*, but only with permission from the wrangler, and merge from there into *V8_8-branch*, following rules above.{endstrike} {section: List of all source code branches}