From 0c06631a710431db4a0b111855fa44ccbd9751b9 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 15 Mar 2019 22:23:24 -0700 Subject: [PATCH] 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 Reviewed-By: Daijiro Wachi Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater --- COLLABORATOR_GUIDE.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index f8d3629eaf6721..0290f14156ef33 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.