1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: simplify force-push guidelines

Browse Source 
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: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Rich Trott 2019-03-15 22:23:24 -07:00
parent 72f578327a
commit bab5544476
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
COLLABORATOR_GUIDE.md
View File

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