{section: Active source code release branches, or where should my code go?}
-*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.3.7, should go into the *master* branch.
+*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.3.8, should go into the *master* branch.
-*: Urgent bug fixes to developer release candidate go into *V8_3_6-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} V8_3_6-branch is *frozen*, and requests to commit to this branch will probably be denied
+*: The V8_3_6-branch is *frozen* except for doc commits. Do _not_ merge *V8_2-branch* changes into it.
+
+*: Urgent bug fixes to developer release candidate go into *V8_3_7-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} {strike}V8_3_7-branch is *frozen*, and requests to commit to this branch will probably be denied{endstrike}
*: Serious bug fixes to stable series features should go into *V8_2-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
-*:: *V8_3_6-branch* with permission of the wranger,and/or
+*:: do _not_ merge into the *V8_3_6-branch*!! instead merge directly into
+*:: *V8_3_7-branch* with permission of the wranger,and/or
*:: *master*, as above.
*: If code needs to be reviewed before pushing, then you should use "git format-patch" to create a patch, and attach it to the ticket. If it's a larger change, you should put it into a topic branch instead.
