|
|
Changes between Version 2 and Version 3 of WhichBranchShouldICommitChangesTo
- Timestamp:
- 10/07/10 01:13:29 (3 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WhichBranchShouldICommitChangesTo
v2 v3 1 1 *** THIS IS STILL WORK IN PROGRESS *** 2 2 3 '''Current Released Version:''' 2. 13 '''Current Released Version:''' 2.8 4 4 5 5 === Overview === 6 6 7 Once the HEAD code is 'Released' it's ne ssassary to continue development on the next version, however it's also possible that we will need to do a 'bug fix' release for the current released version.7 Once the HEAD code is 'Released' it's necessary to continue development on the next version, however it's also possible that we will need to do a 'bug fix' release for the current released version. 8 8 9 Therefore, once a release is done, the relev ent 'branch' is also created. This allows changes to be made to the current version seperate from the HEAD code.9 Therefore, once a release is done, the relevant 'branch' is also created. This allows changes to be made to the current version separate from the HEAD code. 10 10 11 Minor changes, that could become part of the a 'bug fix' release should, therefore, be commit ed to the HEAD branch as well as the current version's branch.11 Minor changes, that could become part of the a 'bug fix' release should, therefore, be committed to the HEAD branch as well as the current version's branch. 12 12 13 13 === What is considered a 'bug fix' === 15 15 Any minor changes, that do not change the fundamental logic, is a bug fix. E.g. a minor word change within a dial plan is a bug fix. Any additional lines entered to the dial plan, or deletion, or NOT a bug fix as would require testing on several production system before considered correct. 16 16 17 === How to do I setup my development enviro ment to commit to both? ===17 === How to do I setup my development environment to commit to both? === 18 18 19 19 === How do I commit to both branches ? ===
