diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c7b1e0d5756..64c6f1d249e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -409,18 +409,9 @@ 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 the PR has been approved, - - 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. - - 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. +1. Once the PR has been approved, you can merge it yourself + by clicking the "Squash and merge" button once it is + green and all CI signals are passing.   diff --git a/docs/source/_static/img/new-contributor-guide/how_to_merge1.png b/docs/source/_static/img/new-contributor-guide/how_to_merge1.png new file mode 100644 index 00000000000..6f06911db97 Binary files /dev/null and b/docs/source/_static/img/new-contributor-guide/how_to_merge1.png differ diff --git a/docs/source/_static/img/new-contributor-guide/how_to_merge2.png b/docs/source/_static/img/new-contributor-guide/how_to_merge2.png new file mode 100644 index 00000000000..e7a38177b36 Binary files /dev/null and b/docs/source/_static/img/new-contributor-guide/how_to_merge2.png differ diff --git a/docs/source/_static/img/new-contributor-guide/how_to_merge3.png b/docs/source/_static/img/new-contributor-guide/how_to_merge3.png new file mode 100644 index 00000000000..88911271f04 Binary files /dev/null and b/docs/source/_static/img/new-contributor-guide/how_to_merge3.png differ diff --git a/docs/source/new-contributor-guide.md b/docs/source/new-contributor-guide.md index 13692da0234..3b2eebfa5f5 100644 --- a/docs/source/new-contributor-guide.md +++ b/docs/source/new-contributor-guide.md @@ -279,6 +279,18 @@ Once you've successfully finished local development, it's time to send out your ![](./_static/img/new-contributor-guide/pr_approval2.png) - Once you've received the required approval from a core contributor, you can go ahead and merge your PR. Congratulations — you're now an official ExecuTorch contributor! +6. Once you've received the required approval from a core contributor, you're very nearly done. We just need to make sure all the CI checks have passed, some of which need approval from a maintainer to start: -Great job making it to the end of our guide — we hope you enjoy contributing. Once again, please check out **[Discord Server](https://discord.com/invite/Dh43CKSAdc)** if you want to say hello, ask any questions, or talk about any and all things ExecuTorch. We look forward to receiving your contributions! + ![](./_static/img/new-contributor-guide/how_to_merge1.png) + + Once all checks these have all been approved, ran, and passed, you can go ahead and merge your PR. If there's a grey `Update branch` button instead of a green `Merge pull request` button, click that first: + + ![](./_static/img/new-contributor-guide/how_to_merge2.png) + + After a moment, the branch should update with the latest changes, and you'll see the final green `Merge pull request` button: + + ![](./_static/img/new-contributor-guide/how_to_merge3.png) + + Click it to merge your changes into the main codebase. Congratulations — you're now an official ExecuTorch contributor! + +Great job making it to the end of our guide — we hope you enjoy contributing. Once again, please check out our **[Discord Server](https://discord.com/invite/Dh43CKSAdc)** if you want to say hello, ask any questions, or talk about any and all things ExecuTorch. We look forward to receiving your contributions!