Have you ever had a conflict with someone on your team? Are you happy with how it was resolved? Unresolved conflicts within Open Source projects can (and have) destroyed teams --- but this does not have to be the case. With training and practice, anyone can improve their conflict resolution skills. If you would like to learn more strategies for handling conflict in an Open Source environment, then this workshop is for you. In this workshop we will create a taxonomy of the conflict types that impact Open Source teams. Then, we will study the conflict resolution strategies that are most successful for each type of conflict. We will spend the second half of this workshop practicing by examining real (but anonymized) conflicts from the Open Source world. We will figure out how each real conflict fits into our taxonomy, and will practice the stratgies for addressing it. Participants will leave the workshop with the skills they need to help their teams prosper. No more hostile forks!
