aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:04:53 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:04:53 +0300
commit91eb30f03795921b48360b79bdb739dcd0f10f17 (patch)
tree1a2fccbbbf4751cf2cf6f6418cb525dcee5f2acd /CONTRIBUTING.md
parenta3ffa6455021b69bd1940b65fefb3b6177c96730 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.tar.gz
PrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.tar.bz2
PrismLauncher-91eb30f03795921b48360b79bdb739dcd0f10f17.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md10
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.