mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-02-22 05:51:10 +00:00
Code Issues Releases Wiki Activity

Update CONTRIBUTING.md

Browse source
This commit is contained in:
morpheus65535 2021-02-23 16:14:13 -05:00 committed by GitHub
parent 90266acd10
commit 2e11fa035b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CONTRIBUTING.md
View file

@ -9,14 +9,14 @@
## Branching ##
### Basic rules ###
- `master` contains only stable releases (which have been merged to `master`) and is intended for end-users.
- `develop` is the target for integration and is not intended for end-users.
- `feature` is a temporary feature branch based on `develop`.
- `development` is the target for integration and is not intended for end-users.
- `feature` is a temporary feature branch based on `development`.
### Conditions ###
- `master` is not merged back to `develop`.
- `develop` is not re-based on `master`.
- all `feature` branches branch from `develop` only.
- Bugfixes created specifically for a feature branch are done there (because they are specific, they're not cherry-picked to develop).
- `master` is not merged back to `development`.
- `development` is not re-based on `master`.
- all `feature` branches branch from `development` only.
- Bugfixes created specifically for a feature branch are done there (because they are specific, they're not cherry-picked to `development`).
- We will not release a patch (0.0.x) if a newer minor (0.x.0) has already been released.