Skip to content

Commit

Permalink
doc: Document forced pushing with git
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
jbergstroem committed Apr 16, 2015
1 parent 10e31ba commit 76f219c
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit 76f219c

Please sign in to comment.