From ccfde5a915786e653b850c7b8dc405fa46c62480 Mon Sep 17 00:00:00 2001 From: joshhunt-alt Date: Tue, 27 May 2025 14:49:25 +0100 Subject: [PATCH] Update backport instructions in contributing docs (#106060) * Update backport instructions in contributing docs * Update merge-pull-request.md --- contribute/merge-pull-request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contribute/merge-pull-request.md b/contribute/merge-pull-request.md index 0e60768892f..6636daded45 100644 --- a/contribute/merge-pull-request.md +++ b/contribute/merge-pull-request.md @@ -118,9 +118,9 @@ In case the pull request introduces a breaking change you should document this. Backporting is the process of copying the pull request into the version branch of one or multiple previous releases. -Backporting is a rare exception, should only be done for _critical bug fixes_, and involves the intervention of a Grafana Labs employee. +Backporting should be a rare exception, reserved only for critical bug fixes, and must be initiated by a Grafana Labs employee. We generally avoid automatic backports, as these changes carry some risk: they typically receive less manual testing than changes included in regular point releases. -If your pull request fixes a critical bug and needs to be backported, add it to the "Critical Bug Release" form so the team can approve the backport and know that a release needs to be made. Specify the correct `backport vx.x` labels for the releases to which the fix needs to be backported. Once approved, the backporting process continues. +If a pull request addresses a critical bug and backporting is warranted, a Grafana Labs team member can apply the appropriate `backport vx.x` labels for the relevant release branches. The team will review and approve the backport before proceeding. When the pull request is merged, seperate backport PRs will automatically be creataed. #### Required labels