diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2024-02-23 19:05:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 19:05:38 +0100 |
| commit | 4a31674816bd4a216f8769ba40f8d0f560aa6d53 (patch) | |
| tree | 1d870120449b4ee1e81c1f078cc105ed424907d9 | |
| parent | f5e87597598926719b38a794949bcf4e0cb551c8 (diff) | |
| parent | c3b66ce3ccefe0bb951c406d5b0b77373512e3d0 (diff) | |
Merge pull request #290936 from benaryorg/doc_readme_table1
CONTRIBUTING.md: change table column order for staging
| -rw-r--r-- | CONTRIBUTING.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 80cbba76a73a3..115dd993ea62f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -439,14 +439,14 @@ gitGraph Here's an overview of the different branches: -| branch | `master` | `staging` | `staging-next` | +| branch | `master` | `staging-next` | `staging` | | --- | --- | --- | --- | -| Used for development | ✔️ | ✔️ | ❌ | -| Built by Hydra | ✔️ | ❌ | ✔️ | -| [Mass rebuilds][mass-rebuild] | ❌ | ✔️ | ⚠️ Only to fix Hydra builds | -| Critical security fixes | ✔️ for non-mass-rebuilds | ❌ | ✔️ for mass-rebuilds | -| Automatically merged into | `staging-next` | - | `staging` | -| Manually merged into | - | `staging-next` | `master` | +| Used for development | ✔️ | ❌ | ✔️ | +| Built by Hydra | ✔️ | ✔️ | ❌ | +| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ | +| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ | +| Automatically merged into | `staging-next` | `staging` | - | +| Manually merged into | - | `master` | `staging-next` | The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names: - `master`/`release-YY.MM` |