HTCondorWiki: Source Code Branches

{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.3, should go into the *master* branch.
+*: Code that implements new features or non-urgent bug fixes, aka code targeted for v8.3.4, should go into the *master* branch.

-*: {strike}Urgent bug fixes to developer release candidate go into *V8_3_3-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} {strike}V8_3_3-branch is *frozen*, and requests to commit to this branch will probably be denied{endstrike}{endstrike}
+*: Urgent bug fixes to developer release candidate go into *V8_3_3-branch, but only with permission of the wrangler*. They should then be merged into *master*. {linebreak} {strike}V8_3_3-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
-*:: {strike}*V8_3_3-branch* with permission of the wranger,and/or{endstrike}
+*:: *V8_3_3-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.

-*:{strike}Very Very Urgent bug fixes to the release candidate might go into *V8_2_7-branch*, but only with permission from the wrangler, and merge from there into *V8_2-branch*, following rules above.{endstrike}
+*:Very Very Urgent bug fixes to the release candidate might go into *V8_2_7-branch*, but only with permission from the wrangler, and merge from there into *V8_2-branch*, following rules above.

{section: List of all source code branches}