Differences

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

--- development:git-branches [2019/01/16 21:20] – [Feature Branches] crhallberg
+++ development:git-branches [2020/08/03 15:03] – [Core Branches] demiankatz
@@ Line 1: / Line 1: @@
 ====== Useful Git Branches ======
-Some features are not available in the core VuFind distribution, either because they have been deprecated or because the VuFind team has not yet committed to maintaining them in the long term. These features are maintained in separate branches in the VuFind GitHub repository and may be merged in manually if they meet your local needs.
+Some features are not available in the core VuFind distribution, either because they have been deprecated, because they have not been released yet, or because the VuFind team has not yet committed to maintaining them in the long term. These features are maintained in separate branches in the VuFind GitHub repository and may be merged in manually if they meet your local needs.
+===== 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.
+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").
+Summary:
+  * If you want the latest bleeding-edge code, use the "dev" 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.
 ===== Feature Branches =====
@@ Line 14: / Line 26: @@
 Features that have been deprecated and removed from master are given "legacy" branches where volunteers are free to keep them up to date with master if they need to do so. Feel free to issue pull requests against the legacy branches if you wish to help keep them up to date.
+  * [[https://github.com/vufind-org/vufind/tree/legacy/amazon|legacy/amazon]] - This contains Amazon cover and review plugins, which were removed in VuFind 7.0.
   * [[https://github.com/vufind-org/vufind/tree/legacy/blueprint|legacy/blueprint]] - This contains the Blueprint theme, which was VuFind 2's default theme until release 2.4. It was removed prior to release 2.5.
   * [[https://github.com/vufind-org/vufind/tree/legacy/bootstrap|legacy/bootstrap]] - This contains the Bootstrap 2 based themes that was released as an experimental beta prior to the official inclusion of the current bootstrap3/bootprint3 themes. These were removed prior to release 2.4.