ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 16:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Contributing.md: master is deprecated, use main.

Browse Source
This commit is contained in:
Athanasius 2020-07-13 13:38:12 +01:00
parent 6f004e6df7
commit 996f317130
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Contributing.md
View File

@ -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