From 1781b6657c87c9d7d57265288b4ca801658319aa Mon Sep 17 00:00:00 2001 From: Athanasius <github@miggy.org> Date: Mon, 13 Jul 2020 13:40:34 +0100 Subject: [PATCH] Contributing.md: beta can lag behind main/stable/develop --- Contributing.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Contributing.md b/Contributing.md index 5868b69c..bb50b7d6 100644 --- a/Contributing.md +++ b/Contributing.md @@ -39,8 +39,11 @@ Somewhat based on git-flow, but our particular take on it: * `stable` - The HEAD of this Branch should always point to the code that was used in the last released stable version. -* `beta` - If we run any pre-release betas *with actual builds released, not just a branch to be run from source*, -then the HEAD of this Branch should always point to the code that was used in the last beta version. +* `beta` - If we run any pre-release betas *with actual builds released, not + just a branch to be run from source*, then the HEAD of this Branch should + always point to the code that was used in the last beta version. *This means + that if there hasn't yet been a new beta version this could be far behind + all of: main, develop, stable.* * `develop` - This is the branch where all current development is integrated. No commits should be made directly to this as the work should be done in a separate branch used in a Pull Request before being merged as part of