From 996f317130a901316f306ae06b6a8c8db2b60b82 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 13 Jul 2020 13:38:12 +0100 Subject: [PATCH] Contributing.md: `master` is deprecated, use `main`. --- Contributing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Contributing.md b/Contributing.md index 4b864cba..5868b69c 100644 --- a/Contributing.md +++ b/Contributing.md @@ -31,7 +31,7 @@ Historically the A.B.C.D version was collapsed into A.BC and then a tag added of forwards we will always use the full version and 'folder style' tag names, e.g. `Release/A.B.C.D` . Currently the only file that defines the version code-wise is `config.py`. `Changelog.md` and `edmarketconnector.xml` -are another matter handled as part of [the release process](https://github.com/EDCD/EDMarketConnector/blob/master/docs/Releasing.md#distribution). +are another matter handled as part of [the release process](https://github.com/EDCD/EDMarketConnector/blob/main/docs/Releasing.md#distribution). Git branch structure and tag conventions --- @@ -53,6 +53,8 @@ then the HEAD of this Branch should always point to the code that was used in th This branch should contain anything from `develop` that is considered well tested and ready for the next `stable` merge. +* `master` - **This is no longer used. If the branch is even present then it's no longer updated. You should be using `main` instead.** + * `releases` - Currently the version of the `edmarketconnector.xml` 'appcast' file in this branch is what live clients check to be notified of new versions. This can potentially be replaced with the `stable` branch's version, but some care will be necessary to ensure no users are left behind (their client checking the `releases` branch which