You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: src/contributing.md
+9-3Lines changed: 9 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -154,9 +154,14 @@ The CI in rust-lang/rust applies your patches directly against the current maste
154
154
not against the commit your branch is based on. This can lead to unexpected failures
155
155
if your branch is outdated, even when there are no explicit merge conflicts.
156
156
157
-
Update your branch only when needed: when you have merge conflicts, upstream CI is broken and blocking your green PR, or a maintainer requests it. Avoid updating an already-green PR under review unless necessary. During review, make incremental commits to address feedback. Prefer to squash or rebase only at the end, or when a reviewer requests it.
157
+
Update your branch only when needed: when you have merge conflicts, upstream CI is broken and blocking your green PR, or a maintainer requests it.
158
+
Avoid updating an already-green PR under review unless necessary.
159
+
During review, make incremental commits to address feedback.
160
+
Prefer to squash or rebase only at the end, or when a reviewer requests it.
158
161
159
-
When updating, use `git push --force-with-lease` and leave a brief comment explaining what changed. Some repos prefer merging from `upstream/master` instead of rebasing; follow the project's conventions. See [keeping things up to date](git.md#keeping-things-up-to-date) for detailed instructions.
162
+
When updating, use `git push --force-with-lease` and leave a brief comment explaining what changed.
163
+
Some repos prefer merging from `upstream/master` instead of rebasing; follow the project's conventions.
164
+
See [keeping things up to date](git.md#keeping-things-up-to-date) for detailed instructions.
160
165
161
166
After rebasing, it's recommended to [run the relevant tests locally](tests/intro.md) to catch any issues before CI runs.
162
167
@@ -435,7 +440,8 @@ Just a few things to keep in mind:
435
440
436
441
#### ⚠️ Note: Where to contribute `rustc-dev-guide` changes
437
442
438
-
For detailed information about where to contribute rustc-dev-guide changes and the benefits of doing so, see [the rustc-dev-guide working group documentation](https://forge.rust-lang.org/wg-rustc-dev-guide/index.html#where-to-contribute-rustc-dev-guide-changes).
443
+
For detailed information about where to contribute rustc-dev-guide changes and the benefits of doing so,
444
+
see [the rustc-dev-guide working group documentation](https://forge.rust-lang.org/wg-rustc-dev-guide/index.html#where-to-contribute-rustc-dev-guide-changes).
0 commit comments