Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CONTRIBUTING.md

Browse source
This commit is contained in:
Jakub 2024-05-15 22:35:44 +01:00 • committed by GitHub
parent 4e8892278a
commit 6acdbfa6ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -11,7 +11,7 @@ What you will read under has been agreed by the current active team in order to
- If you are allowed to merge PRs, do not do such until code has been properly reviewed, preferably by more than one person.
- Merge PRs using **squash and merge** mode to preserve main branch history in original state. For squash merge commit, leave list of commits in commit description (GitHub does it automatically in both desktop client and web interface).
- Do not revert active development branch to a previous commit unless you are absolutely sure there will be no regressions. Do not revert parts of code to a previous state for the same reasons. In both of those cases, the entire team needs to be aware of it and agree on the decision.
- There are **three key branches** arranged in a hierarchy: `master`, `develop`, and `test`. `master` is to be used for releases, and nothing else. `develop` is based on `master` and may be used for active development. **Every PR should use it as its base**. `test` is based on `develop` and serves as the "freshest" branch where testing and bugfixes occur. To keep in sync, for release period they are to be merged in the following order: `test` -> `develop` -> `master`.
- There are **two key branches** arranged in a hierarchy: `master`, `develop`. `master` is to be used for releases, and nothing else. `develop` is based on `master` and may be used for active development. **Every PR should use it as its base**. To keep in sync, for release period they are to be merged in the following order: `develop` -> `master`.
**2. Tester**