From 1223ac17d86da2fa423127e8b4f9a53863be9140 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Wed, 27 May 2026 11:45:54 -0400 Subject: [PATCH] Clarify RFC merge instructions No one can merge to the `master` branch directly because of branch protection rules. The filename change and link additions should happen in the PR, then merged in with the merge button if you're allowed and request review from internal-sites if you're not. --- src/lang/rfc-merge-procedure.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lang/rfc-merge-procedure.md b/src/lang/rfc-merge-procedure.md index 00b9b1574..c6bb6f24d 100644 --- a/src/lang/rfc-merge-procedure.md +++ b/src/lang/rfc-merge-procedure.md @@ -42,14 +42,17 @@ team and asking them to do so.) ### Step 2: Merge the RFC PR itself -In your local git checkout: +Once FCP has completed with no concerns unaddressed, in your local git checkout: -- Merge the RFC PR into master in your fork +- Check out your RFC PR's branch - Add a commit that moves the file name from 0000- to its RFC number - Edit the new file to include links to the RFC PR and the tracking issue you just created in the header -- Open a PR or push directly to the master branch on rust-lang/rfcs, as - appropriate +- Push to your RFC PR + +If you have permissions to merge PRs to rust-lang/rfcs, click the merge button +on your PR in the GitHub UI. If you don't have permission to merge the PR, +comment with `r? internal-sites` to have a maintainer merge it on your behalf. ### Step 3: Leave a comment