File tree 1 file changed +14
-0
lines changed
1 file changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -150,6 +150,20 @@ when contributing to Rust under [the git section](./git.md).
150
150
[ t-compiler ] : https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler
151
151
[ triagebot ] : https://github.com/rust-lang/rust/blob/master/triagebot.toml
152
152
153
+ ### Keeping your branch up-to-date
154
+
155
+ The CI in rust-lang/rust applies your patches directly against the current master,
156
+ not against the commit your branch is based on. This can lead to unexpected failures
157
+ if your branch is outdated, even when there are no explicit merge conflicts.
158
+
159
+ Before submitting or updating a PR, make sure to update your branch
160
+ as mentioned [ here] ( git.md#keeping-things-up-to-date ) if it's significantly
161
+ behind the master branch (e.g., more than 100 commits behind).
162
+ This fetches the latest master branch and rebases your changes on top of it,
163
+ ensuring your PR is tested against the latest code.
164
+
165
+ After rebasing, it's recommended to [ run the relevant tests locally] ( tests/intro.md ) to catch any issues before CI runs.
166
+
153
167
### r?
154
168
155
169
All pull requests are reviewed by another person. We have a bot,
You can’t perform that action at this time.
0 commit comments