IIUC, the major purpose for not using the "rebase and merge" button is to overcome the problems caused by concurrent mergings. Admittedly, the chance such problems happen is higher approaching and during the release testing phase, and the damage is also more significant. However, such problems can also happen at other times. Moreover, I'm not sure about having two different sets of rules for the release testing phase and other times.
On the other hand, I totally understand that it's annoying having to check out a super straightforward PR (e.g., fixing doc typos) locally and merge it manually. The question is how do we decide whether a PR is straightforward enough or not. I guess that is where we would need to trust the committers' technical judgement. Notice that the guidelines use different tones: MUST (NOT) & SHOULD (NOT). IMHO, MUST means a guideline must be strictly followed, while SHOULD means a guideline is suggested in general but exceptions with good reasons are acceptable. WDYT? Thank you~ Xintong Song On Fri, Jul 2, 2021 at 3:25 PM Kurt Young <ykt...@gmail.com> wrote: > It seems disabling the merge button was only proposed during the release > testing phase, which IMO doesn't > mean we can't use it forever. > > Best, > Kurt > > > On Fri, Jul 2, 2021 at 3:01 PM Xintong Song <tonysong...@gmail.com> wrote: > > > It was part of the draft proposed in this mail [1]. And before that, it > was > > brought up several times in both ML discussions [2][3] and IIRC offline > > release syncs. > > > > If that is too implicit and there are objections, I'm open to keeping on > > that discussion. > > > > Thank you~ > > > > Xintong Song > > > > > > [1] > > > > > https://lists.apache.org/thread.html/r09c4b8a03bc431adb5d7eaa17cb8e849f16da7a802b20798f32235cc%40%3Cdev.flink.apache.org%3E > > [2] > > > > > https://lists.apache.org/thread.html/r76e1cdba577c6f4d6c86b23fdaeb53c4e3744c20d0b3e850fc2e14a7%40%3Cdev.flink.apache.org%3E > > [3] > > > > > https://lists.apache.org/thread.html/r25ed92303cdefe41cdcc2935c2b06040b1bc7590ded01a26506a1e49%40%3Cdev.flink.apache.org%3E > > > > On Fri, Jul 2, 2021 at 2:19 PM Chesnay Schepler <ches...@apache.org> > > wrote: > > > > > > - SHOULD NOT use the GitHub UI to merge PRs > > > > > > Where was this discussed? > > > > > > > > > On 7/2/2021 6:59 AM, Xintong Song wrote: > > > > Hi Flink committers, > > > > > > > > As previously discussed [1], the criteria for merging pull requests > has > > > > been updated. > > > > > > > > A full version of guidelines can be found on the project wiki [2]. > The > > > > following are some of the highlights. > > > > - MUST make sure passing the CI tests before merging PRs > > > > - SHOULD NOT use the GitHub UI to merge PRs > > > > - For frequent test instabilities that are temporarily disabled, the > > > > corresponding JIRA tickets must be made BLOCKER > > > > > > > > I'd like to kindly ask all Flink committers to please read through > the > > > new > > > > guidelines and merge PRs accordingly. > > > > > > > > Thank you~ > > > > > > > > Xintong Song > > > > > > > > > > > > [1] > > > > > > > > > > https://lists.apache.org/thread.html/r136028559a23e21edf16ff9eba6c481f68b4154c6454990ee89af6e2%40%3Cdev.flink.apache.org%3E > > > > > > > > [2] > > > > https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests > > > > > > > > > > > > >
