ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-06 10:23:06 +03:00
Code Issues Projects Releases Wiki Activity

We now use 'main' instead of 'master' in place of 'develop'

Browse Source 
After 4.0.0.0 we need to not have 'develop' as default branch, so change it
now, and migrate to 'main' instead of 'master' whilst we're at it.
This commit is contained in:
Athanasius 2020-07-10 11:07:45 +01:00
parent fb6e4b1d38
commit d4706a053e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Contributing.md
View File

@ -46,11 +46,12 @@ then the HEAD of this Branch should always point to the code that was used in th
to this as the work should be done in a separate branch used in a Pull Request before being merged as part of to this as the work should be done in a separate branch used in a Pull Request before being merged as part of
resolving that Pull Request. resolving that Pull Request.
* `master` - To avoid accidental commits that could have unintended consequences we do NOT use this branch. * `main` - Yes, we've renamed this from `master`. See
see `develop` or `stable` instead. However, whenever a new stable release is made `master` should be fast-forwarded "[Using 'main' as the primary branch in Git](https://github.com/EDCD/EDMarketConnector/wiki/Git-Using-Main-Branch)"
to remain in sync with `stable`, as this is the default branch for git (but we've set GitHub to use `develop` for instructions on ensuring you're cleanly using it in any local clone.
as the default branch). Anyone working on something without first reading these guidelines is also likely to
have worked on either local `master` directly, or a branch based on it. This branch should contain anything from `develop` that is considered well
tested and ready for the next `stable` merge.
* `releases` - Currently the version of the `edmarketconnector.xml` 'appcast' file in this branch is what live * `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, clients check to be notified of new versions. This can potentially be replaced with the `stable` branch's version,