Date: 11/12/2018 1. Deploy from branches named "portal-Rxx" where xx is two-digit number. Note: a. Branches named like "portal-Rxx" (where xx is two-digit number) are production branches. b. The only changes we make to "portal-Rxx" branches are bug fixes that need to get into production quickly. c. Any changes we make on the production branch must also be made on the trunk so that they'll be included in the next production branch. This can be done manually or by merging the production branch back into the trunk, whichever seems easier. d. We develop new features on the trunk or on a personal development branch which we eventually merge into the trunk. e. Personal branches should be named something other than "portal-Rxx", something like "john_doe_feature_1." f. The trunk should always be in a state where it can be built and deployed so people working on an unrelated features, such as changes to pise xml files, can checkout and use the trunk for their work too. Thus, if you need to commit your new feature changes in an non-buildable state, or a state where unrelated features don't work, you should use your personal dev branch. Otherwise you can work directly on the trunk.