Skip to content

Commit 409447d

Browse files
authored
Update CONTRIBUTING.md and New Contributors Guide to reflect that anyone can merge PRs after checks and approvals (#10123)
### Summary As discussed in [this PR](#10118), anyone can merge PRs once approved and all CI checks have passed. `CONTRIBUTING.md` was outdated, saying only people with write-access could merge. This change: * Updates CONTRIBUTING.md to reflect the fact anyone can merge their PR after required approvals and checks. * Adds step-by-step instructions on this to the New Contributors Guide. --------- Co-authored-by: jhels <[email protected]>
1 parent 5d76299 commit 409447d

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

Diff for: CONTRIBUTING.md

+3-12
Original file line numberDiff line numberDiff line change
@@ -409,18 +409,9 @@ for basics.
409409
- If the reviewers have requests or questions, follow up with them.
410410
- The goal of the reviewer is to ensure that the code in the `main` branch of
411411
the repo is consistent, maintainable, and of high quality.
412-
1. Once the PR has been approved,
413-
- If you have the "write permission" in this repo, you can merge it yourself
414-
by clicking the "Squash and merge" button once it is green and all CI
415-
signals are passing.
416-
- If you don't have "write permission" in this repo, the reviewer will take
417-
care of the PR. The reviewer may import the PR into Meta's internal system
418-
to validate it against internal CI.
419-
- If the PR is approved but not merged within 5 business days, please comment
420-
on the PR to ask about its status.
421-
- Note that if the `main` [CI](#continuous-integration) jobs are broken, we
422-
will only merge PRs that fix the broken jobs until all critical jobs are
423-
fixed.
412+
1. Once the PR has been approved, you can merge it yourself
413+
by clicking the "Squash and merge" button once it is
414+
green and all CI signals are passing.
424415

425416
&nbsp;
426417

Loading
39.7 KB
Loading
65.4 KB
Loading

Diff for: docs/source/new-contributor-guide.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,18 @@ Once you've successfully finished local development, it's time to send out your
279279
280280
![](./_static/img/new-contributor-guide/pr_approval2.png)
281281
282-
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!
282+
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:
283283
284-
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!
284+
![](./_static/img/new-contributor-guide/how_to_merge1.png)
285+
286+
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:
287+
288+
![](./_static/img/new-contributor-guide/how_to_merge2.png)
289+
290+
After a moment, the branch should update with the latest changes, and you'll see the final green `Merge pull request` button:
291+
292+
![](./_static/img/new-contributor-guide/how_to_merge3.png)
293+
294+
Click it to merge your changes into the main codebase. Congratulations — you're now an official ExecuTorch contributor!
295+
296+
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!

0 commit comments

Comments
 (0)