Skip to content

Commit c22bcca

Browse files
committed
fixup! mention if others touch the same branch
1 parent 8da4e6c commit c22bcca

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

COLLABORATOR_GUIDE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,5 +220,6 @@ With git, there's a way to override remote trees by force pushing
220220
you're rewriting history on a repository other people are working
221221
against) but is allowed for simpler slip-ups such as typos in commit
222222
messages. You are only allowed to force push to any io.js branch
223-
within 10 minutes from your original push. After that period passes,
223+
within 10 minutes from your original push. If someone else pushes to
224+
the branch your commit lives in or the 10 minute period passes,
224225
consider the commit final.

0 commit comments

Comments
 (0)