summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Glasgall <glasgall@mit.edu>2014-02-27 19:06:05 -0500
committerGravatar Adam Glasgall <glasgall@mit.edu>2014-02-27 19:06:05 -0500
commit733ff2638b4a5e7d9c1a5c98fe95b603911f767f (patch)
treeaeae250f36a961a625054cfe51255909d4e2d9fc
parent4b93d53e5d25b8a4a830646b9e6fec48db69ce9c (diff)
fix bad merge
-rw-r--r--code-of-conduct.txt4
1 files changed, 3 insertions, 1 deletions
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