Skip to content

Commit 2b29d4a

Browse files
authored
Merge pull request #1056 from carols10cents/rfc-merge-procedure
Clarify RFC merge instructions
2 parents f91f2bb + 1223ac1 commit 2b29d4a

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/lang/rfc-merge-procedure.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@ team and asking them to do so.)
4242

4343
### Step 2: Merge the RFC PR itself
4444

45-
In your local git checkout:
45+
Once FCP has completed with no concerns unaddressed, in your local git checkout:
4646

47-
- Merge the RFC PR into master in your fork
47+
- Check out your RFC PR's branch
4848
- Add a commit that moves the file name from 0000- to its RFC number
4949
- Edit the new file to include links to the RFC PR and the tracking issue you
5050
just created in the header
51-
- Open a PR or push directly to the master branch on rust-lang/rfcs, as
52-
appropriate
51+
- Push to your RFC PR
52+
53+
If you have permissions to merge PRs to rust-lang/rfcs, click the merge button
54+
on your PR in the GitHub UI. If you don't have permission to merge the PR,
55+
comment with `r? internal-sites` to have a maintainer merge it on your behalf.
5356

5457
### Step 3: Leave a comment
5558

0 commit comments

Comments
 (0)