From 733ff2638b4a5e7d9c1a5c98fe95b603911f767f Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Thu, 27 Feb 2014 19:06:05 -0500 Subject: fix bad merge --- code-of-conduct.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code-of-conduct.txt b/code-of-conduct.txt index f238478..af61619 100644 --- a/code-of-conduct.txt +++ b/code-of-conduct.txt @@ -75,9 +75,11 @@ someone from making a dangerous mistake, you may wish to consider finding a different way to say it. Remember, people don't remember what you tell them, they remember how you make them feel. +Back-seat driving is disruptive + If you overhear people working through a problem, avoid intermittently lobbing advice across the room. This can lead to the "too -many cooks" problem, but more importantly, it can be rude and disruptive +many cooks" problem, but more important, it can be rude and disruptive to half-participate in a conversation. This isn't to say you shouldn't help, offer advice, or join conversations. On the contrary, we encourage all those things. Rather, it just means that when you want -- cgit v1.2.3