File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ This necessitates a manual process of syncing any changes made to the dev guide
36
36
copy maintained in the rust-lang/rust repo.
37
37
38
38
1 . Wait at least a week since the last subtree sync took place.
39
- 2 . There will either be an automatically opened rustc-pull PR, or performing a rustc-pull encountered merge
39
+ 2 . There will either be an automatically opened rustc-pull PR, or a manual rustc-pull will be needed if there are merge
40
40
conflicts. If there is a rustc-pull PR open, merge it[ ^ 1 ] , otherwise a manual rustc-pull should be performed.
41
41
See [ rustc-dev-guide #2451 ] for an example rustc-pull.
42
42
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
55
55
56
56
[ rust-lang/rust#141962 ] : https://github.com/rust-lang/rust/pull/141962
57
57
[ rustc-dev-guide#2451 ] : https://github.com/rust-lang/rustc-dev-guide/pull/2451
58
- [ subtree_coordination ] : https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Frustc-dev-guide/topic/Subtree.20sync.20automation/with/522133712
58
+ [ subtree_coordination ] : https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Frustc-dev-guide/topic/Subtree.20sync.20automation/with/522133712
You can’t perform that action at this time.
0 commit comments