Branches and Merging Process¶
Branches exists only for the current release of the AGA project. After a new release the old branch version will not receive any new updates unless special circumstances occurs. During a special circumstance the AGA governors will decide the actions taken.
Branches follow this formula when calculating the next release:
When doing a full release the first name is used where x is equal to the major version and y is equal to the number of full releases including itself. The last value is w, which is equal to the number of minor releases for the current branch including itself.
Merging The Old Release Branch¶
Before all minor and full releases the current release branch will be merged back into the master branch. After this process is done the last merge commit will be tagged with the release branch name plus the addition of “-final” (as an example release-1.2.0-final).