From 1095d7e615dba9fc2c0293e2be7ad789adaa3577 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 19 Sep 2016 14:00:51 -0400 Subject: [PATCH] xpace --- docsite/rst/committer_guidelines.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docsite/rst/committer_guidelines.rst b/docsite/rst/committer_guidelines.rst index 10815eda30f..3b841b88287 100644 --- a/docsite/rst/committer_guidelines.rst +++ b/docsite/rst/committer_guidelines.rst @@ -42,6 +42,7 @@ General Rules Individuals with direct commit access to ansible/ansible (+core, + extras) are entrusted with powers that allow them to do a broad variety of things--probably more than we can write down. Rather than rules, treat these as general *guidelines*, individuals with this power are expected to use their best judgement. * Don’t + - Commit directly. - Merge your own PRs. Someone else should have a chance to review and approve the PR merge. If you are a Core Committer, you have a small amount of leeway here for very minor changes. - Forget about alternate environments. Consider the alternatives--yes, people have bad environments, but they are the ones who need us the most. @@ -51,6 +52,7 @@ Individuals with direct commit access to ansible/ansible (+core, + extras) are e - Forget to keep it simple. Complexity breeds all kinds of problems. * Do + - Squash, avoid merges whenever possible, use github's squash commits or cherry pick if needed (bisect thanks you). - Be active. Committers who have no activity on the project (through merges, triage, commits, etc.) will have their permissions suspended. - Consider backwards compatibility (goes back to "don’t break existing playbooks").