From a82931f2576798d1af62cf7fd85992abca50c71f Mon Sep 17 00:00:00 2001 From: Yaacov Rydzinski Date: Mon, 19 Aug 2024 08:00:29 +0300 Subject: [PATCH 1/3] Add flexibility around the waiting period for merging PRs --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 494302de1b..002e758b30 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -82,7 +82,7 @@ ensure your pull request matches the style guides, run `npm run prettier`. ## Merge Process -Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, we must wait 2 weeks before merging the pull request, this allows for other reviewers to give feedback without rushing any merges. Pull request can be merged by a member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. +Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, it may be merged by any member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. For medium-size or above changes, it is recommended to wait 1-2 weeks before merging to allow for additional feedback from other reviewers. Large changes must be discussed prior to merging at a GraphQL JS Working Group meeting. ## Release on NPM From 4f0103e5681c6cc25fa05a937b654144afc7796d Mon Sep 17 00:00:00 2001 From: Yaacov Rydzinski Date: Wed, 4 Sep 2024 21:27:10 +0300 Subject: [PATCH 2/3] remove hard requirements in favor eventual consensus I continue to think that very specific rules slow down velocity too much, and that the guiding principle should be that all changes should be made by consensus, with the idea that no change is set in stone. --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 002e758b30..8e789bcd4c 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -82,7 +82,7 @@ ensure your pull request matches the style guides, run `npm run prettier`. ## Merge Process -Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, it may be merged by any member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. For medium-size or above changes, it is recommended to wait 1-2 weeks before merging to allow for additional feedback from other reviewers. Large changes must be discussed prior to merging at a GraphQL JS Working Group meeting. +Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, it may be merged by any member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. For more complex pull requests, a larger cohort of reviewers is suggested. Any reviewer may -- at any time -- request that the topic be brought for more in depth discussion at GraphQL JS Working Group meeting, where decisions will be made by consensus. A PR that has been merged without discussion at a GraphQL JS Working Group meeting should be reverted if a more in depth discussion is requested. ## Release on NPM From e9929ab8ffa0003b1c7e4e93949bbe96904789a9 Mon Sep 17 00:00:00 2001 From: Yaacov Rydzinski Date: Fri, 6 Sep 2024 15:26:21 +0300 Subject: [PATCH 3/3] weaken the reversion case as a blanket rule is not helpful --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8e789bcd4c..0308c012a0 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -82,7 +82,7 @@ ensure your pull request matches the style guides, run `npm run prettier`. ## Merge Process -Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, it may be merged by any member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. For more complex pull requests, a larger cohort of reviewers is suggested. Any reviewer may -- at any time -- request that the topic be brought for more in depth discussion at GraphQL JS Working Group meeting, where decisions will be made by consensus. A PR that has been merged without discussion at a GraphQL JS Working Group meeting should be reverted if a more in depth discussion is requested. +Once a pull request has been approved by 2 reviewers from [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers) team, it may be merged by any member of the [`@graphql/graphql-js-reviewers`](https://github.com/orgs/graphql/teams/graphql-js-reviewers-write) team. For more complex pull requests, a larger cohort of reviewers is suggested. Any reviewer may request that the topic be brought for more in depth discussion at GraphQL JS Working Group meeting, where decisions will be made by consensus. A PR that has been merged without discussion at a GraphQL JS Working Group meeting may be reverted if a more in depth discussion is later requested. ## Release on NPM