From 073ddd892eb354d77902e3a6b5d6dcb5aa02eeca Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Wed, 13 Jan 2021 11:51:44 +0100 Subject: contributing.md: Change labels for backported PRs This is somewhat convention already and it makes keeping track of missing backports a lot easier. --- .github/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) (limited to '.github') 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 ` and add a reason. Otherwise use `git cherry-pick -x `. 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 -- cgit 1.4.1