Document branching structure

This change documents the currently used branching structure. It has been cut down to not include any controversial changes. Signed-off-by: Kjeld Schouten-Lebbing <[email protected]> Requires-builders: style
openzfs · Sep 28, 2020 · 958040c · 958040c
1 parent 7b8363d
commit 958040c
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -175,6 +175,20 @@ to verify ZFS is behaving as intended.
 
 ## Style Guides
 
+### Repository Structure
+
+OpenZFS uses a standardised branching structure.
+- The "development and main branch", is the branch all development should be based on.
+- "Release branches" contain the latest released code for said version.
+- "Staging branches" contain selected commits prior to being released.
+
+Development and Main branch: `master`
+Release branches: `zfs-$VERSION-release`
+Staging branches: `zfs-$VERSION-staging`
+
+`$VERSION` should be replaced with the `major.minor` version number.
+(This is the version number without the `.patch` version at the end)
+
 ### Coding Conventions
 We currently use [C  Style  and  Coding  Standards  for
 SunOS](http://www.cis.upenn.edu/%7Elee/06cse480/data/cstyle.ms.pdf) as our