-
Notifications
You must be signed in to change notification settings - Fork 8
Workflow
mbermanarl edited this page Oct 25, 2019
·
3 revisions
The Persistent Branches | ||||
---|---|---|---|---|
Name | Purpose | Branch From | Merge To | Comments |
_release | Always holds the current released code | <None> | <None> | |
_develop | Current development code | <None> | InternalDevelopment | Merged back into InternalDevelopment to ensure synchronization with internal development code. |
_internalDevelop | Internal development code | <None> | <None> | code that will not be released into GITHUB |
The Short-lived Branches | ||||
Hotfix-### | Addresses an immediate need to fix released code. | _release | _release _develop |
Each branch should resolve a narrowly defined bug set. The branch needs to be merged explicitly back into both branches. |
R-V##.## | Release Candidate | _develop | _develop _release |
Used for testing/finalizing a release, must also modify Version.txt in this branch to match its name |
P_####_XXXXXXX | New Feature | _develop | _develop | Should be time-limited to add a particular feature set |
I_####_XXXXXXXX | New Internal Feature | _developInternal | _developInternal PI_####_XXXXXX |
Feature initially intended not to be released. If released, create a 'New Feature' branch from _develop, then merge this into that feature and ensure compatibility and security, then merge that feature back into _develop |