From c49b8d04c7f9a2014ff4c63d29c0dfe9e83622f3 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 14 Aug 2019 14:32:51 +0200 Subject: [PATCH] doc: update backport section Only maintainers can set labels on PRs, so let's clarify that point in the doc which says something confusing at the moment. Signed-off-by: Guillaume Abrioux --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5e2da6e6b..8d76b9754 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,9 +41,9 @@ This will prevent the engine merging your pull request. ### Backports (maintainers only) -If you wish to see your work from 'master' being backported to a stable branch you can apply a label on the PR that points to the desired stable branch. -Labels for backports are name: `backport-stable-`, eg: `backport-stable-3.2`. -Once the PR from master is merged, a backport PR will be created by mergify, if there is a cherry-pick conflict you must resolv it by pulling the branch. +If you wish to see your work from 'master' being backported to a stable branch you can ping a maintainer +so he will set the backport label on your PR. Once the PR from master is merged, a backport PR will be created by mergify, +if there is a cherry-pick conflict you must resolv it by pulling the branch. **NEVER** push directly into a stable branch, **unless** the code from master has diverged so much that the files don't exist in the stable branch. If that happens, inform the maintainers of the reasons why you pushed directly into a stable branch, if the reason is invalid, maintainers will immediatly close your pull request. -- 2.39.5