Skip to content

Commit a0ce08d

Browse files
Mark Bestavrosmbestavros
authored andcommitted
Update CONTRIBUTING.md with new merge criteria
Signed-off-by: Mark Bestavros <mbestavr@redhat.com>
1 parent d998f56 commit a0ce08d

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

CONTRIBUTING.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This commit fixed that pesky bug that we all hated.
7171
resolves: PROJ-1234
7272
Signed-off-by: John Doe <jdoe@example.com>
7373
74-
# Please enter the commit message for your changes. Lines starting
74+
# Please enter the commit message for your changes. Lines starting
7575
# with '#' will be ignored, and an empty message aborts the commit.
7676
#
7777
# Date: Fri Jan 10 00:00:00 2025 -0400
@@ -85,7 +85,7 @@ All commits must be signed-off
8585

8686
### Pull Requests
8787

88-
All changes must come from a pull request (PR) and cannot be directly committed. While anyone can engage in activity on a PR, pull requests are only approved by team members.
88+
All changes must come from a pull request (PR) and cannot be directly committed. While anyone can engage in activity on a PR, pull requests may only be approved by team members.
8989

9090
Before a pull request can be merged:
9191
* The PR body should contain a line similar to one of the following:
@@ -97,7 +97,10 @@ Before a pull request can be merged:
9797
* The contribution must follow the style guidelines of this project
9898
* Multiple commits should be used if the PR is complex and clarity can be improved, but they should still relate to a single topic
9999
* For code contributions, tests have to be added/modified to ensure the code works
100-
* There has to be at least one approval
100+
* The pull request must be approved by [dev team members](https://github.com/orgs/enterprise-contract/teams/devs):
101+
* If submitted by a non-team member, the pull request must have at least two approving reviews
102+
* If submitted by a team member, the pull request must have at least one approving review
103+
* If the changes are "simple" (e.g. a typo fix), the pull request only needs one approval, regardless of origin. Team members may exercise their best judgement when determining if a PR qualifies as a simple fix.
101104
* The feature branch must be rebased so it contains the latest changes from the target branch
102105
* The CI has to pass successfully
103106
* Every comment has to be addressed and resolved

0 commit comments

Comments
 (0)