From 89d87ffdd5ecdb7d411dacc8265aebbc449bd1be Mon Sep 17 00:00:00 2001 From: Amit Aryeh Levy Date: Fri, 1 Mar 2024 21:37:06 -0500 Subject: [PATCH] WGs: Add language to clarify that Core WG also resolves conflicts --- doc/wg/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/wg/README.md b/doc/wg/README.md index 99063a7e21..31d04a7903 100644 --- a/doc/wg/README.md +++ b/doc/wg/README.md @@ -65,9 +65,11 @@ their needs and membership. The Core Working Group shepherds and oversees the Tock OS and related tools and libraries. Importantly, it serves as a backstop for managing -contributions that fall outside the purview of existing working -groups. It also establishes new working groups to handle such -contributions, and dissolves or re-organizes existing working groups. +contributions that fall outside the purview of existing working groups +and for resolving conflicts about contributions that fall under the +purview of multiple working groups. It also establishes new working +groups to handle such contributions, and dissolves or re-organizes +existing working groups. Formally, the Core Working Group controls who can directly commit to all Tock project repositories and devolves the ability to commit to