From a230538269624fcd7d59299e60cbc5e309a6f14b Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:44:14 -0700 Subject: [PATCH 1/3] Update CONTRIBUTING.md to reflect "Squash and merge" option Currently, PR doesn't need to go through internal landing. Reviewers and contributors with "write permission" can just squash and merge and PR themselves. Update the docs to reflect it. --- CONTRIBUTING.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ad23f84d17..75162cca545 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -272,8 +272,13 @@ for basics. - If the reviewers have requests or questions, follow up with them. - The goal of the reviewer is to ensure that the code in the `main` branch of the repo is consistent, maintainable, and of high quality. -1. Once approved, your reviewer will import the PR into Meta's internal system - and merge it from there. +1. Once approved, your reviewer will merge the PR. + - If you have the "write permission" to repo, and see the "Squash and merge" + button is green and all CI signals are good, you can merge it yourself. The + commit message in the text box when you click "Squash and merge" is the final + commit message in repo, so please make it meaningful. + - The reviewer may import the PR into Meta's internal system to validate it + against internal CI. - If the PR is approved and not merged within a few business days, please comment on the PR to ask about its status. - Note that if the `main` [CI](#continuous-integration) jobs are broken, we From 253d75a0177a96da5d0117185c90d84bdd1604c5 Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:05:28 -0800 Subject: [PATCH 2/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 75162cca545..99cbf32fe28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -272,15 +272,16 @@ for basics. - If the reviewers have requests or questions, follow up with them. - The goal of the reviewer is to ensure that the code in the `main` branch of the repo is consistent, maintainable, and of high quality. -1. Once approved, your reviewer will merge the PR. - - If you have the "write permission" to repo, and see the "Squash and merge" - button is green and all CI signals are good, you can merge it yourself. The - commit message in the text box when you click "Squash and merge" is the final - commit message in repo, so please make it meaningful. - - The reviewer may import the PR into Meta's internal system to validate it - against internal CI. - - If the PR is approved and not merged within a few business days, please - comment on the PR to ask about its status. +1. Once the PR has been approved, + - If you have the "write permission" in this repo, and see the "Squash and + merge" button is green and all CI signals are passing, you can merge it + yourself by pushing the "Squash and merge" button, and then type the final + commit message in the text box. + - If you don't have "write permission" in this repo, the reviewer will take + care of the PR. The reviewer may import the PR into Meta's internal system + to validate it against internal CI. + - If the PR is approved but not merged within 5 business days, please comment + on the PR to ask about its status. - Note that if the `main` [CI](#continuous-integration) jobs are broken, we will only merge PRs that fix the broken jobs until all critical jobs are fixed. From 52fe30221266398f9034132c2cdedaf5fcdfc711 Mon Sep 17 00:00:00 2001 From: Hansong <107070759+kirklandsign@users.noreply.github.com> Date: Mon, 18 Nov 2024 14:09:22 -0800 Subject: [PATCH 3/3] Update CONTRIBUTING.md Co-authored-by: Dave Bort --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99cbf32fe28..540bf2cd051 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -273,10 +273,9 @@ for basics. - The goal of the reviewer is to ensure that the code in the `main` branch of the repo is consistent, maintainable, and of high quality. 1. Once the PR has been approved, - - If you have the "write permission" in this repo, and see the "Squash and - merge" button is green and all CI signals are passing, you can merge it - yourself by pushing the "Squash and merge" button, and then type the final - commit message in the text box. + - If you have the "write permission" in this repo, you can merge it yourself + by clicking the "Squash and merge" button once it is green and all CI + signals are passing. - If you don't have "write permission" in this repo, the reviewer will take care of the PR. The reviewer may import the PR into Meta's internal system to validate it against internal CI.