From ef31e59dba9414259b080451a5f2dbeba8b58108 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Mar 2021 08:00:25 -0700 Subject: [PATCH] alter wording in SIP process about flags --- _sips/sip-submission.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_sips/sip-submission.md b/_sips/sip-submission.md index ec871ceadc..1d7d1d0609 100644 --- a/_sips/sip-submission.md +++ b/_sips/sip-submission.md @@ -150,10 +150,11 @@ the formal evaluation phase. ### Merging the proposal -If the SIP is accepted, the committee will propose a release date to the -compiler maintainers, where the role of the committee ends. Accepted SIPs will -then be merged under a flag. When SIPs introduce intricate changes and they -cannot be merged under a flag, the compiler maintainers will merge it directly. +If the SIP is accepted, the committee will propose a release date to +the compiler maintainers, where the role of the committee ends. +(Compiler maintainers may choose to merge changes under a flag +initially, for testing, or directly, as they deem appropriate, +taking committee and community feedback into consideration.) ## Structure of the process