doc/CONTRIBUTION.md: document mediation process#20648
Merged
crasbe merged 1 commit intoRIOT-OS:masterfrom Nov 1, 2025
Merged
Conversation
mguetschow
previously requested changes
May 3, 2024
Contributor
mguetschow
left a comment
mguetschow
left a comment
There was a problem hiding this comment.
Thanks a lot for putting effort into this! LGTM on a first read, just one typo and a suggestion below.
Contributor
|
@AnnsAnns do you want to pick this up as a procrastination project? :) |
Member
|
I mean is there even anything to do here? This looks pretty much mergeable aside from the email potentially not existing? |
Contributor
|
If you're happy, maybe we can poke @maribu to squash the commits and @mguetschow to dismiss the Change Request? :) |
crasbe
added
Type: enhancement
As agreed upon in the weekly coordination meeting we want to set up a channel / tool / process to aid contributors to solve conflicts. This is especially aimed to empower contributors to solve conflicts with maintainers, as we were unsure that the existing code of conduct violation mechanism is sufficient to address conflicts that do not involve a CoC violation. Co-authored-by: mguetschow <[email protected]>
crasbe
approved these changes
Nov 1, 2025
crasbe
dismissed
mguetschow’s stale review
The requested changes were adapted.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
As agreed upon in the weekly coordination meeting we want to set up a channel / tool / process to aid contributors to solve conflicts.
This is especially aimed to empower contributors to solve conflicts with maintainers, as we were unsure that the existing code of conduct violation mechanism is sufficient to address conflicts that do not involve a CoC violation.
Testing procedure
Issues/PRs references
None