...
When the next major development release began, the decision was made to move to multi-module Maven projects for OpenSAML and the IdP. Therefore, new repositories were created and the three libraries in the OpenSAML stack were merged in to the new OpenSAML repository, likewise for the two IdP libraries and the new IdP repository. All work done prior to the conversions to git occurred on trunk and is now occurring on master"main".
Current Branching and Tagging Practices
...
- Development of a new major or minor version is initially performed on trunk/masterthe "main" branch.
- When a new version is released, tags are created from wherever the work for that release was done.
- A branch is not generally created. If after work begins on a new major/minor release, it becomes necessary to produce a patch release, a branch is then created from the original tag for the release being patched, and any fixes warranted from master/trunk are "main" are backported/merged back at that time.
- Once the branch exists, bug fixes may need to be applied to both the branch for the previous stable minor release and master/trunkand "main".
This "late branching" policy should minimize the amount of time that bugs need to be fixed in two places.
...