Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1508 from Kodiologist/merge-policy

Browse Source 
Policy: allow PRs to be merged more easily
This commit is contained in:
Kodi Arfer 2018-02-24 10:07:07 -08:00 committed by GitHub
commit 0345d2b688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CONTRIBUTING.rst
View File

@ -120,15 +120,20 @@ handy. Conversely, avoid this exact language if you want to mention
an issue without closing it (because e.g. you've partly but not an issue without closing it (because e.g. you've partly but not
entirely fixed a bug). entirely fixed a bug).
Before any PR is merged, it must be approved by members of Hy's core team There are two situations in which a PR is allowed to be merged:
other than the PR's author. Changes to the documentation, or trivial changes
to code, need to be approved by **one** member; all other PRs need to be
approved by **two** members.
Anybody on the team may perform the merge. Merging should create a merge commit 1. When it is approved by **two** members of Hy's core team other than the PR's
(don't squash unnecessarily, because that would remove separation between author. Changes to the documentation, or trivial changes to code, need only
logically separate commits, and don't fast-forward, because that would throw **one** approving member.
away the history of the commits as a separate branch), which should 2. When the PR is at least **two weeks** old and **no** member of the Hy core
team has expressed disapproval of the PR in its current state. (Exception: a
PR to create a new release is not eligible to be merged under this criterion,
only the first one.)
Anybody on the Hy core team may perform the merge. Merging should create a
merge commit (don't squash unnecessarily, because that would remove separation
between logically separate commits, and don't fast-forward, because that would
throw away the history of the commits as a separate branch), which should
include the PR number in the commit message. include the PR number in the commit message.
Contributor Code of Conduct Contributor Code of Conduct