Skip to content

Commit 3002188

Browse files
TrottBethGriggs
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 42c26a6 commit 3002188

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
@@ -682,13 +682,11 @@ git push upstream master
682682
* Ping a TSC member.
683683
* `#node-dev` on freenode
684684
* With `git`, there's a way to override remote trees by force pushing
685-
(`git push -f`). This should generally be seen as forbidden (since
686-
you're rewriting history on a repository other people are working
687-
against) but is allowed for simpler slip-ups such as typos in commit
688-
messages. However, you are only allowed to force push to any Node.js
689-
branch within 10 minutes from your original push. If someone else
690-
pushes to the branch or the 10 minute period passes, consider the
691-
commit final.
685+
(`git push -f`). This is generally forbidden as it creates conflicts in other
686+
people's forks. It is permissible for simpler slip-ups such as typos in commit
687+
messages. You are only allowed to force push to any Node.js branch within 10
688+
minutes from your original push. If someone else pushes to the branch or the
689+
10-minute period passes, consider the commit final.
692690
* Use `--force-with-lease` to minimize the chance of overwriting
693691
someone else's change.
694692
* Post to `#node-dev` (IRC) if you force push.

0 commit comments

Comments
 (0)