---

Teaching open source communities about conflict resolution

At OSCON in Portland this year, Donna Benjamin and Gina Likins are combining forces to talk about a topic that is sometimes easily dismissed: conflict resolution. Given the growing need to address conflict in technology, and that even popular projects like the Linux Kernel adopting codes of conduct, it’s no surprise that conferences feature talks on human interaction.