Skip to content

Commit 0c06631

Browse files
Trotttargos
authored andcommitted
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 <vsemozhetbyt@gmail.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent 1385b29 commit 0c06631

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

COLLABORATOR_GUIDE.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -624,13 +624,11 @@ git push upstream master
624624
* Ping a TSC member.
625625
* `#node-dev` on freenode
626626
* With `git`, there's a way to override remote trees by force pushing
627-
(`git push -f`). This should generally be seen as forbidden (since
628-
you're rewriting history on a repository other people are working
629-
against) but is allowed for simpler slip-ups such as typos in commit
630-
messages. However, you are only allowed to force push to any Node.js
631-
branch within 10 minutes from your original push. If someone else
632-
pushes to the branch or the 10 minute period passes, consider the
633-
commit final.
627+
(`git push -f`). This is generally forbidden as it creates conflicts in other
628+
people's forks. It is permissible for simpler slip-ups such as typos in commit
629+
messages. You are only allowed to force push to any Node.js branch within 10
630+
minutes from your original push. If someone else pushes to the branch or the
631+
10-minute period passes, consider the commit final.
634632
* Use `--force-with-lease` to minimize the chance of overwriting
635633
someone else's change.
636634
* Post to `#node-dev` (IRC) if you force push.

0 commit comments

Comments
 (0)