Skip to content

rgd: fix text regarding rustc-pull merge conflict #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2025
Merged

rgd: fix text regarding rustc-pull merge conflict #883

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/wg-rustc-dev-guide/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This necessitates a manual process of syncing any changes made to the dev guide
copy maintained in the rust-lang/rust repo.

1. Wait at least a week since the last subtree sync took place.
2. There will either be an automatically opened rustc-pull PR, or performing a rustc-pull encountered merge
2. There will either be an automatically opened rustc-pull PR, or a manual rustc-pull will be needed if there are merge
conflicts. If there is a rustc-pull PR open, merge it[^1], otherwise a manual rustc-pull should be performed.
See [rustc-dev-guide#2451] for an example rustc-pull.
3. Post in the [zulip channel for coordinating subtree syncs][subtree_coordination] that you're doing a sync
Expand All @@ -55,4 +55,4 @@ guide, then the subtree sync can be delayed until there are actual changes to sy

[rust-lang/rust#141962]: https://github.com/rust-lang/rust/pull/141962
[rustc-dev-guide#2451]: https://github.com/rust-lang/rustc-dev-guide/pull/2451
[subtree_coordination]: https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Frustc-dev-guide/topic/Subtree.20sync.20automation/with/522133712
[subtree_coordination]: https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Frustc-dev-guide/topic/Subtree.20sync.20automation/with/522133712