Differences

This shows you the differences between two versions of the page.

--- development:git-branches [2020/09/22 14:26] – demiankatz
+++ development:git-branches [2020/11/06 17:46] – [Key Branches and Tags] demiankatz
@@ Line 5: / Line 5: @@
 ===== Key Branches and Tags =====
-Mainline VuFind development takes place in the "dev" branch. If you want "bleeding edge" code, this is the branch you should use.
+Mainline VuFind development takes place in the "dev" branch. If you want "bleeding edge" code slated for the next planned release, this is the branch you should use.
+If work begins on a major release while a minor release is still being worked on in "dev," a "dev-x.y" branch (e.g. "dev-8.0") may be created to allow future development to begin without interfering with nearer-future work.
 Whenever a major or minor release is issued, a maintenance branch is created so that bug fixes can be applied as needed. These maintenance branches are named "release-x.y" -- for example, "release-6.1" or "release-7.0". Note that patch releases do not get separate release branches, because we do not apply bug fixes against specific patch releases; we instead simply continue the "minor" release line. Every release receives a tag starting with "v" and the version number (e.g. "v6.1.2" or "v7.0").
@@ Line 11: / Line 13: @@
 Summary:
-  * If you want the latest bleeding-edge code, use the "dev" branch.
+  * If you want the latest bleeding-edge code being prepared for the next scheduled release, use the "dev" branch.
+  * If you want a preview of a future major release, you may be able to find a "dev-x.y" branch.
   * If you want the latest bug fixes for a particular major or minor release, use the matching "release-x.y" branch.
   * If you want to get an exact release from a specific point in time, use the "vx.y.z" tag.