Skip to content

Commit c699e2e

Browse files
authored
Merge pull request #20648 from maribu/doc/mediation
doc/CONTRIBUTION.md: document mediation process
2 parents 12b719a + b92fa91 commit c699e2e

File tree

1 file changed

+43
-0
lines changed

1 file changed

+43
-0
lines changed

CONTRIBUTING.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ of this document using the following links:
99
* [Contributing code][contributing-code]
1010
* [Writing Documentation][writing-documentation]
1111
* [Working with Git][working with git]
12+
* [Mediate Conflicts][mediate-conflicts]
1213

1314
If you have questions, please write a post over at our [forum] or chat on
1415
`#riot-os:matrix.org` on [Matrix].
@@ -363,3 +364,45 @@ PR:
363364
```console
364365
$ git push --force-with-lease
365366
```
367+
368+
## Mediating Conflicts
369+
[mediate-conflicts]: #mediate-conflicts
370+
371+
A diverse community such as the RIOT community has inherently a diverse set of
372+
views and opinions. Occasionally those may clash, even with all parties adhering
373+
to our [code of conduct][code-of-conduct]. In case you seek out help to resolve
374+
it you may send an email to [mediator email list][email-mediator]. The email
375+
will be forwarded to a panel of mediators consisting of trusted RIOT
376+
community members including both maintainers and non-maintainers.
377+
378+
We see the mediation as a tool to solve conflicts, not as a way to sanction
379+
people. Hence, do not be afraid to contact our mediators and equally do not
380+
feel denounced or punished if someone invokes mediation.
381+
382+
This is a (non-exhaustive) list of reasons you can ask for mediation:
383+
384+
- You are a contributor and feel being treated unfairly by another contributor
385+
or maintainer
386+
- Your PR is rejected/blocked for unjust or non-technical reasons.
387+
- A PR is rejected/blocked for valid technical reasons, but without due
388+
consideration of your arguments
389+
- A maintainer is asking for disproportionate changes to your PR in order
390+
to get it upstream, e.g. fixing issues unrelated to your PR
391+
- You disagree with other contributors/maintainers on how RIOT should evolve
392+
- E.g. there are competing pull requests that cover highly related use
393+
cases and there is a disagreement which should be preferred
394+
- A pull requests results (or resulted) deliberately in a regression for a
395+
particular use case, e.g. by doing a different trade-off that benefits
396+
another use case
397+
- A feature relevant for your use case has been deprecated/removed
398+
(e.g. to reduce maintenance burden, reduce (perceived) duplication of
399+
features, etc.) but your use case relies on the feature or implementation
400+
details of the feature
401+
402+
Note: Violations of our [code of conduct][code-of-conduct] should be reported
403+
to [email-coc]. See our [code of conduct][code-of-conduct] for more
404+
details.
405+
406+
[code-of-conduct]: CODE_OF_CONDUCT.md
407+
[email-mediator]: mailto:[email protected]
408+
[email-coc]: mailto:[email protected]

0 commit comments

Comments
 (0)