From aea7d282fe5fa3a75fe190c508de0625d3505ced Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:13:03 +0100 Subject: [PATCH] updated contributing.md --- CONTRIBUTING.md | 15 +++++++++++++++ fragments/version.sh | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f725b46..83637f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,6 +4,21 @@ __Please note, that if you are contributing to this project with new labels or o We try to keep the script as short as possible, and with more than 300 labels, we can save 300 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases. +## Branches + +The branch list is as follows: + +- `release`: this branch will have the latest released version +- `main`: (default) this branch will be the latest release plus new and updated app labels, and critical bug fixes +- `dev`: this will contain new and updated app labels, as well as any other code changes +there will be other branches for new features and testing + +This should allow the contributing team to release minor updates for new and updated app labels while also work on new features for the next major release. + +With all the new branches, your local repo may get confused. If you don’t have local changes, it is easiest to delete your local repo and re-clone it. If you have local changes you want to preserve, then you should commit those to a local branch, pull the latest changes `git pull --all`, then delete the old master branch: `git branch -d master`. + +Make sure you branch off of main for new and updated labels and off of `dev` for other code changes. Thank you for contributing! + ## Labels If you need a new label for a piece of software, please take a look at the tutorials in the Wiki, if those can be helpful for starting out on the creation of the label. diff --git a/fragments/version.sh b/fragments/version.sh index 2f52450..633e31a 100644 --- a/fragments/version.sh +++ b/fragments/version.sh @@ -1 +1 @@ -10.0 +9.1beta