Sannse Carter, one of Wikia’s Community Support Team members, recently wrote a list of 
tips for dealing with conflict in wiki communities:
- Assume Good Faith
- Don’t Feed the Trolls
- Keep Calm and Carry On
Other suggestions include:
- Stay polite
- Don’t make it personal
- Remember the audience
- Check your understanding
- Talk to others/get a second opinion
- Be flexible and find middle ground
- Rewrite until you get it right
- Consider talking live to the person you’re having an issue with
Read her entire post Converting Conflict to Calm.