File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -97,9 +97,17 @@ impact on performance, it can be marked `rollup=always`.
97
97
98
98
Often it is tempting to address a regression by posting a follow-up PR that,
99
99
rather than reverting the regressing PR, instead augments the original in
100
- small ways without reverting its changes overall. However,
101
- if real-world users have reported being affected, this practice is strongly
102
- discouraged unless a high-confidence fix is already in the bors queue.
100
+ small ways without reverting its changes overall. However, if real-world users
101
+ have reported being affected, this practice is strongly discouraged unless one
102
+ of the following is true:
103
+
104
+ * A high-confidence fix is already in the bors queue.
105
+ * The regression has made it to a release branch (beta or stable) and a
106
+ [ backport] is needed. Often the "smallest possible change" is desired for a
107
+ backport. The offending PR may or may not still be reverted on the main
108
+ branch; this is left to the discretion of someone who can ` r+ ` it.
109
+
110
+ [ backport ] : ../release/backporting.md
103
111
104
112
While it can feel like a significant step backward to have your PR reverted, in
105
113
most cases it is much easier to land the PR a second time once a fix can be
You can’t perform that action at this time.
0 commit comments