diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-30 15:33:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-30 15:33:46 -0700 |
| commit | b9fe37aec14b7cc61cbef09d5d2256f68a48d220 (patch) | |
| tree | d2f5422ffe3a2c4732068bdee3b6fede3404fb8e /CONTRIBUTING.md | |
| parent | 520594e5296b09205e55bc018b1f759df5725e96 (diff) | |
| parent | 9137721e8e5b44f2338a36874a393435cbc6daa3 (diff) | |
| download | PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.gz PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.tar.bz2 PrismLauncher-b9fe37aec14b7cc61cbef09d5d2256f68a48d220.zip | |
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4bca126f..07291677 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ In an effort to ensure that the code you contribute is actually compatible with This can be done by appending `-s` to your `git commit` call, or by manually appending the following text to your commit message: -``` +```text <commit message> Signed-off-by: Author name <Author email> @@ -27,7 +27,7 @@ Signed-off-by: Author name <Author email> By signing off your work, you agree to the terms below: -``` +```text Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: @@ -61,3 +61,9 @@ As a bonus, you can also [cryptographically sign your commits][gh-signing-commit [gh-signing-commits]: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits [gh-vigilant-mode]: https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits + +## Backporting to Release Branches + +We use [automated backports](https://github.com/PrismLauncher/PrismLauncher/blob/develop/.github/workflows/backport.yml) to merge specific contributions from develop into `release` branches. + +This is done when pull requests are merged and have labels such as `backport release-7.x` - which should be added along with the milestone for the release. |