From bbe3fb28b2f848e20c88ceca8ccd73544aadfc75 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 15 Aug 2016 19:54:08 +0200 Subject: [PATCH] CONTRIBUTING.md: Address review comments. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4f811132..eeb174ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,10 +40,10 @@ the mailing list have a tendency to fall through the cracks. integration environment will try to build it on a number of platforms. If this reports a failure, please investigate and fix the problem. We will at best do a very casual review for failing PRs. -* *Don't rebase:* Rebasing our branch destroys the review history. If a review +* *Don't rebase:* Rebasing your branch destroys the review history. If a review takes a long time, we may ask you to rebase on a more recent *master*, but please don't do it without being asked. -* *types.db:* One of the most common mistakes done by new contributors is the +* *types.db:* One of the most common mistakes made by new contributors is the addition of (many) new *types* in the file `src/types.db`. The majority of usecases can be met with one of the existing entries. If you plan to add new entries to `src/types.db`, you should talk to us early in the design -- 2.11.0