Skip to content

Commit d2fe0c9

Browse files
committed
Align with coredev Plone Contributor Agreement with PR
Refs: plone/buildout.coredev#851
1 parent b2ec254 commit d2fe0c9

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

coredev/agreement.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ A common way to start contributing is to participate in a [Plone sprint](https:/
5353

5454
## Dealing with pull requests on GitHub
5555

56-
Before we can merge a pull request, we have to check that the author has signed the contributor's agreement.
56+
Before we can merge a pull request, we must ensure that the author has signed the Plone Contributor Agreement.
5757

58-
If they're listed in <https://github.com/orgs/plone/teams/developers/members>, the author has signed so we can go ahead and merge.
58+
If they're listed in either the [Developers](https://github.com/orgs/plone/teams/developers/members) or [Contributors](https://github.com/orgs/plone/teams/contributors/members) team, the author has signed the Plone Contributor Agreement, so we can go ahead and merge.
5959

60-
If they aren't listed there, there's still a chance they have signed the contributor's agreement.
60+
If they aren't listed there, they may have signed and returned the Plone Contributor Agreement, but they were not yet added to a team.
61+
You can ask [email protected] to verify.
6162

62-
If they have signed before the move to GitHub, you can ask <[email protected]> to check.
63-
64-
Pull requests without contributor's agreement can only be merged in trivial cases, and only by the release manager.
63+
Pull requests without a signed Plone Contributor Agreement can only be merged in trivial cases, and only by the release manager.

0 commit comments

Comments
 (0)