From 29fb7da2106b77886961ccac726dac9de0c4dd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Tue, 14 Apr 2015 17:26:19 +1000 Subject: [PATCH] fixup! mention if others touch the same branch --- COLLABORATOR_GUIDE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 92dc3c47efe87a..13f71a68617246 100644 --- 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.