Skip to content

Commit 76f219c

Browse files
committed
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: #1420 Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Roman Reiss <[email protected]>
1 parent 10e31ba commit 76f219c

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

COLLABORATOR_GUIDE.md

+11
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,14 @@ Time to push it:
212212
```text
213213
$ git push origin v1.x
214214
```
215+
216+
### I just made a mistake
217+
218+
With git, there's a way to override remote trees by force pushing
219+
(`git push -f`). This should generally be seen as forbidden (since
220+
you're rewriting history on a repository other people are working
221+
against) but is allowed for simpler slip-ups such as typos in commit
222+
messages. However, you are only allowed to force push to any io.js
223+
branch within 10 minutes from your original push. If someone else
224+
pushes to the branch your commit lives in or the 10 minute period
225+
passes, consider the commit final.

0 commit comments

Comments
 (0)