Skip to content

Commit a44cd17

Browse files
committed
contributing: restore tests/intro.md link; avoid 'this repo' wording
1 parent d170192 commit a44cd17

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,11 @@ The CI in rust-lang/rust applies your patches directly against the current maste
154154
not against the commit your branch is based on. This can lead to unexpected failures
155155
if your branch is outdated, even when there are no explicit merge conflicts.
156156

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 at the end, and do so 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. 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.
158158

159159
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.
160160

161-
After updating, run local checks (e.g., `mdbook build` for this repo) to catch issues before CI runs.
161+
After rebasing, it's recommended to [run the relevant tests locally](tests/intro.md) to catch any issues before CI runs.
162162

163163
### r?
164164

0 commit comments

Comments
 (0)