From 9967bdd2976a43fc210cb5be50d0b479e4fa21d9 Mon Sep 17 00:00:00 2001 From: Tshepang Mbambo Date: Mon, 9 Jun 2025 07:24:46 +0200 Subject: [PATCH] rgd: fix text regarding rustc-pull merge conflict --- src/wg-rustc-dev-guide/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wg-rustc-dev-guide/README.md b/src/wg-rustc-dev-guide/README.md index 27bde271..5bb261d3 100644 --- a/src/wg-rustc-dev-guide/README.md +++ b/src/wg-rustc-dev-guide/README.md @@ -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 @@ -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 \ No newline at end of file +[subtree_coordination]: https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Frustc-dev-guide/topic/Subtree.20sync.20automation/with/522133712