From e9cf8c16f31dae59d5bfb870f0628e0ddca9208a Mon Sep 17 00:00:00 2001 From: Chloe Kudryavtsev Date: Tue, 26 Mar 2019 17:04:24 -0400 Subject: [policies] Draft initial conflict resolution --- modules/Policies/pages/conflicts.adoc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/Policies/pages/conflicts.adoc b/modules/Policies/pages/conflicts.adoc index 8b13789..db51a20 100644 --- a/modules/Policies/pages/conflicts.adoc +++ b/modules/Policies/pages/conflicts.adoc @@ -1 +1,13 @@ += Conflict Resolution +Sometimes, conflicts between teams arise. +This document describes how to handle these situations. +== Conflicts Between a Team and Project Policy +If a team wishes to disobey a project-wide policy, they *must* do so with the explicit approval of the rest of the project. +This approval *must* be gotten through a xref:voting.adoc[Vote]. +Doing otherwise is grounds for dissolution. + +== Conflicts Between a Subteam and its Parent +If a parent team disagrees with a child, the team with the highest specificity normally wins out. +For example, if the packaging team and the python team disagree on a flag to pass to python's configure script, the python team has priority. +If the parent team believes the matter to be vital, they may call for a xref:voting.adoc[Vote]. -- cgit v1.2.3