Skip to content

Commit a1cf659

Browse files
authored
Merge pull request #2574 from rust-lang/tshepang/sembr
split overlong physical lines
2 parents 6b6e5ed + 3f93aae commit a1cf659

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/contributing.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,14 @@ 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 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.
158161

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.
160165

161166
After rebasing, it's recommended to [run the relevant tests locally](tests/intro.md) to catch any issues before CI runs.
162167

@@ -435,7 +440,8 @@ Just a few things to keep in mind:
435440

436441
#### ⚠️ Note: Where to contribute `rustc-dev-guide` changes
437442

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).
439445

440446
## Issue triage
441447

0 commit comments

Comments
 (0)