From 180190e2867e44298cd85a381c93bdf9b214c8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Wed, 15 Apr 2015 14:25:09 +1000 Subject: [PATCH] fixup! suggestion by @Fishrock123 --- COLLABORATOR_GUIDE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 13f71a68617246..20949eeefbab5b 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -219,7 +219,7 @@ 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. 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. +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.