From b4d343e16263dfbee2fa15b5728e79854ce1c338 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 3 Jan 2023 10:16:49 +0100 Subject: [PATCH] [v9.3.x] Docs: Update `merge-pull-request.md` regarding backport policies (#59252) Docs: Update `merge-pull-request.md` regarding backport policies (#59239) * Update merge-pull-request.md * yarn run prettier:write (cherry picked from commit 27bd50da52ab2c4b8483f77a9ad5002eba020bcb) Co-authored-by: Dimitris Sotirakis --- contribute/merge-pull-request.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md index 365f77d36615..69e2781fd4be 100644 --- a/contribute/merge-pull-request.md +++ b/contribute/merge-pull-request.md @@ -135,6 +135,14 @@ Some examples when backport is not required: - The change is supposed to be released in the next major/minor release, e.g. v8.0.0, but the release branch, e.g. v8.0.x, has not yet been created. +#### Required labels + +To ensure that we don't backport pull requests that don't need to be backported, i.e. implement new features, and only backport pull requests that address bugs, have a product approval, or refer to docs changes, backport labels need to be followed by either: + +- `type/bug` label: Pull requests which address bugs, +- `product-approved` label: Urgent fixes which need product approval, in order to get merged, +- `type/docs` label: Docs changes`. + > **Note:** You can still backport a pull request after it's been merged. ## Doing the actual merge