From 0ee4bc22e52197e878cbfed83e1c621cbbf6f33a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 16 Nov 2020 09:40:50 -0500 Subject: [PATCH] Add note about changelog --- CONTRIBUTING.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f5f1587d8..cf8e58a17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,14 +103,18 @@ any work that's already in progress. be assigned to you so that others are aware it's being worked on. A maintainer will then mark the issue as "accepted." -* Any pull request which does _not_ relate to an accepted issue will be closed. +* Any pull request which does _not_ relate to an **accepted** issue will be closed. -* All major new functionality must include relevant tests where applicable. +* All new functionality must include relevant tests where applicable. * When submitting a pull request, please be sure to work off of the `develop` branch, rather than `master`. The `develop` branch is used for ongoing development, while `master` is used for tagging stable releases. +* In most cases, it is not necessary to add a changelog entry: A maintainer will +take care of this when the PR is merged. (This helps avoid merge conflicts +resulting from multiple PRs being submitted simultaneously.) + * All code submissions should meet the following criteria (CI will enforce these checks):