summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-01-15 00:10:01 +0100
committerGitHub <noreply@github.com>2021-01-15 00:10:01 +0100
commit9c099f64207ce239f8055511b860594b4497fdd9 (patch)
treec90431c2108c1c68c87ff869e88b133644004476
parent6b3a546f9fd2e02d5ba1ffcc69161222b4d98131 (diff)
parent073ddd892eb354d77902e3a6b5d6dcb5aa02eeca (diff)
Merge pull request #109263 from erictapen/contributing-mention-backported-commits
contributing.md: change labels on backported PRs
-rw-r--r--.github/CONTRIBUTING.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8ec9d535332d..31060040c1a7 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -57,6 +57,7 @@ Follow these steps to backport a change into a release branch in compliance with
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
+6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier.
## Reviewing contributions