Skip to content

Commit

Permalink
Tidy up conflict res
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo Zanini <[email protected]>
  • Loading branch information
ricardozanini committed May 15, 2024
1 parent 38631a2 commit 251b8aa
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,8 @@ document for more information about opening pull requests.

## Conflict Resolution

To merge changes into the specification, at least 66% approval from the project's maintainers is required.
Maintainers who do not explicitly voice their opinions on the pull request within the two-day approval period are
assumed to agree through [lazy consensus](http://communitymgt.wikia.com/wiki/Lazy_consensus).
To merge changes into the specification, approval from at least one maintainer, other than the pull request's author, is required.
Maintainers who do not explicitly voice their opinions on the pull request within the two-day approval period are assumed to agree through [lazy consensus](http://communitymgt.wikia.com/wiki/Lazy_consensus).

Discussions and voting can be posponed in case one of the maintainers expressed that
they won't be available for personal reasons, e.g. parental leave, vacations, sick leave, etc.
Expand Down

0 comments on commit 251b8aa

Please sign in to comment.