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 <ruben@bridgewater.de>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>

Author: Trott

COLLABORATOR_GUIDE.md

@@ -610,9 +610,8 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 ```
 
 That means a commit has landed since your last rebase against `upstream/master`.
-To fix this, pull with rebase from upstream and run the tests again (to make
-sure no interactions between your changes and the new changes cause any
-problems), and push again:
+To fix this, pull with rebase from upstream, run the tests again, and (if the
+tests pass) push again:
 
 ```sh
 git pull upstream master --rebase