These are some rules of thumb that I've come up with after working on wikipedia for awhile. I don't claim they're exhaustive, or perfect, nor do I claim to have followed them as closely as I should. But I do believe they are an excellent place to start when thinking about how to deal with conflict.