Skip to content

Commit fc35523

Browse files
TrottBethGriggs
authored andcommitted
doc: simplify Troubleshooting text
In the Troubleshooting section of the Collaborator Guide, there is one particularly lengthy and difficult-to-understand sentence. Make it shorter and more clear. PR-URL: #26652 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Vse Mozhet Byt <[email protected]>
1 parent 983ea7f commit fc35523

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

COLLABORATOR_GUIDE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,8 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
668668
```
669669

670670
That means a commit has landed since your last rebase against `upstream/master`.
671-
To fix this, pull with rebase from upstream and run the tests again (to make
672-
sure no interactions between your changes and the new changes cause any
673-
problems), and push again:
671+
To fix this, pull with rebase from upstream, run the tests again, and (if the
672+
tests pass) push again:
674673

675674
```sh
676675
git pull upstream master --rebase

0 commit comments

Comments
 (0)