From 76f219c128ea729972226c064e79f9b3aa494eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Tue, 14 Apr 2015 16:37:20 +1000 Subject: [PATCH] doc: Document forced pushing with git Mention that we generally disallow forced pushes but allow it in trivial cases within 10 minutes of the original push unless the branch pushed to already has new commits. PR-URL: https://github.com/iojs/io.js/pull/1420 Reviewed-By: Rod Vagg Reviewed-By: Jeremiah Senkpiel Reviewed-By: Roman Reiss --- COLLABORATOR_GUIDE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index c4b06cbbe5cb3a..20949eeefbab5b 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -212,3 +212,14 @@ Time to push it: ```text $ git push origin v1.x ``` + +### I just made a mistake + +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 io.js +branch within 10 minutes from your original push. If someone else +pushes to the branch your commit lives in or the 10 minute period +passes, consider the commit final.