Consider having guidelines for conflict resolution
I think it would be useful for the project to create and agree on guidelines for resolving conflicts.
I'm creating this ticket as a place for collecting input and would propose that a working group, if other people consider such guidelines useful, takes the input, refines it, and makes a proposal for discussion aiming at consensus to the project.
https://www.seedsforchange.org.uk/conflictbooklet.pdf I find this resource quite useful as a guide.
I'm attaching a file that comes from another organization that has a similar layout as the Tails project (remote workers in 15+ countries). I think it's really good, but would probably need adapting to our internal team layout. The ABC model part has been added by myself, and was not part of the original file.
Some more links that seem relevant here:
Also very interesting: http://atcc-konfliktbearbeitung.de/atcc/der-ansatz-konstruktiver-konfliktbearbeitung-atcc (this is in German). It's a french method, but in French there is so much less detailed information :( (a bit here maybe: https://tilia-formation.fr/quest-ce-que-la-t-c-c/).