fixup! mention if others touch the same branch

nodejs · Apr 15, 2015 · 29fb7da · 29fb7da
1 parent 4085c49
commit 29fb7da
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
@@ -220,5 +220,6 @@ With git, there's a way to override remote trees by force pushing
 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
-within 10 minutes from your original push. After that period passes,
+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.