doc: simplify force-push guidelines

Edit the guildelines for force-pushing in Collaborator Guide. There are no policy changes, but the material is simplified a bit and the sentences are now shorter. PR-URL: #26699 Reviewed-By: Vse Mozhet Byt <[email protected]> Reviewed-By: Daijiro Wachi <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
nodejs · Apr 17, 2019 · 3002188 · 3002188
1 parent 42c26a6
commit 3002188
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -682,13 +682,11 @@ git push upstream master
 * Ping a TSC member.
 * `#node-dev` on freenode
 * With `git`, there's a way to override remote trees by force pushing
-(`git push -f`). This should generally be seen as forbidden (since
-you're rewriting history on a repository other people are working
-against) but is allowed for simpler slip-ups such as typos in commit
-messages. However, you are only allowed to force push to any Node.js
-branch within 10 minutes from your original push. If someone else
-pushes to the branch or the 10 minute period passes, consider the
-commit final.
+  (`git push -f`). This is generally forbidden as it creates conflicts in other
+  people's forks. It is permissible for simpler slip-ups such as typos in commit
+  messages. You are only allowed to force push to any Node.js branch within 10
+  minutes from your original push. If someone else pushes to the branch or the
+  10-minute period passes, consider the commit final.
   * Use `--force-with-lease` to minimize the chance of overwriting
   someone else's change.
   * Post to `#node-dev` (IRC) if you force push.