doc: Document forced pushing with git #1420
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 typo's in commit |
|
@jbergstroem also perhaps worth adding "as long as nobody else has pushed to the repo in the meantime" or words to that effect. worth bringing attention to @iojs/tc, this introduces a policy of allowing force pushes for a period of 10 minutes after your push for simple fixes such as commit message typos |
|
@rvagg added a note about it and fixed the typo's (ha ha). |
|
lgtm |
| (`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. You are only allowed to force push to any io.js branch |
There was a problem hiding this comment.
"However, you are only allowed"
|
LGTM otherwise |
|
LGTM too, I'm guilty of this. |
Mention that we generally disallow forced pushes but allow it in trivial cases within 10 minutes of the original push.
jbergstroem
force-pushed
the
doc/force_pushing
branch
from
c22bcca to
180190e
Compare
|
Updated and rebased including all suggestions. |
|
Thanks. It is very helpful. |
jbergstroem
added a commit
that referenced
this pull request
Apr 16, 2015
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]>
|
Merged in 76f219c. Thanks for the feedback and review, people. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mention that we generally disallow forced pushes but allow it in trivial cases within 10 minutes of the original push.
Refs #1355