diff options
| author | Rich Trott <rtrott@gmail.com> | 2019-03-15 22:23:24 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-03-17 23:16:53 -0700 |
| commit | bab55444764c72c208d6f2dd426a0208e4edaf2f (patch) | |
| tree | a20d492e8a34c5e7c45e72fd8adc1a964ff0a24e /COLLABORATOR_GUIDE.md | |
| parent | 72f578327a3195f3381ceeacf3c8dd5acb5aa5bd (diff) | |
| download | node-new-bab55444764c72c208d6f2dd426a0208e4edaf2f.tar.gz | |
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: 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>
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
| -rw-r--r-- | COLLABORATOR_GUIDE.md | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index f8d3629eaf..0290f14156 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -624,13 +624,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. |