From 5fe54d688945dd71adcd63068b61d5058fd33242 Mon Sep 17 00:00:00 2001 From: Justin Starry Date: Sat, 18 Nov 2023 01:01:29 +0800 Subject: [PATCH] Update .mergify.yml Co-authored-by: Trent Nelson --- .mergify.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 3c139a941674d7..e844d40e258e75 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -106,9 +106,11 @@ pull_request_rules: message: > Backports to the stable branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. - Backported changes should be reduced to the smallest viable change, - refactoring should be done in a separate change that is not - backported. + Changes intended for backport should be structured such that a + minimum effective diff can be committed separately from any + refactoring, plumbing, cleanup, etc that are not strictly + necessary to achieve the goal. Any of the latter should go only + into master and ride the normal stabilization schedule. - name: v1.17 feature-gate backport conditions: - label=v1.17