Update 'Workflow'

M M Arif 2021-05-01 17:26:29 +02:00
parent 534f0ddd4d
commit 0eb2d0262b
1 changed files with 5 additions and 5 deletions

@ -5,16 +5,16 @@
- **Stable** - release a stable version.
## Branches
- **master** - tip of the ongoing development.
- **main** - tip of the ongoing development.
- **release** - Every release will have its own branch including release tag. Minor fixes can be branched from that specific release.
- **Temporary branches** like feature, hotfix etc which will then be removed once merged to the main tree of **master**.
- **Temporary branches** like feature, hotfix etc which will then be removed once merged to the main tree of **main**.
## Tags / Releases
All the releases will be tagged for download with release notes.
## Pull Requests
All the code going to master will be through MRs even from the main developer. No direct pushes are allowed to **master**.
If you want to contribute please read the [contribution file here](https://codeberg.org/gitnex/GitNex/src/branch/master/CONTRIBUTING.md).
All the code going to main will be through MRs even from the main developer. No direct pushes are allowed to **main**.
If you want to contribute please read the [contribution file here](https://codeberg.org/gitnex/GitNex/src/branch/main/CONTRIBUTING.md).
## Notes on bug fix releases
GitNex has the **master** branch as a tip branch and has version branches such as **release-1.0**. **release-1.0** is a release branch and will be tagged as **1.0.0**. If **1.0.0** has bugs, pull requests will be merged to **release-1.0** branch and publish a **1.0.1** tag, with a fast forward merge to **master** too.
GitNex has the **main** branch as a tip branch and has version branches such as **release-1.0**. **release-1.0** is a release branch and will be tagged as **1.0.0**. If **1.0.0** has bugs, pull requests will be merged to **release-1.0** branch and publish a **1.0.1** tag, with a fast forward merge to **main** too.