Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

doc: Document forced pushing with git #1420

Closed
wants to merge 5 commits into from
Closed

doc: Document forced pushing with git #1420

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91053aa
doc: Document forced pushing with git
jbergstroem Apr 14, 2015
7329285
fixup! grammar
jbergstroem Apr 14, 2015
4085c49
fixup! typo
jbergstroem Apr 14, 2015
29fb7da
fixup! mention if others touch the same branch
jbergstroem Apr 14, 2015
180190e
fixup! suggestion by @Fishrock123
jbergstroem Apr 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions COLLABORATOR_GUIDE.md
View file
Open in desktop
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.