From b6f9beea7f38ced1709078e250588b6c3aaecda2 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 2 Jan 2019 13:20:49 -0500 Subject: [PATCH] Updated Contributor Policies (markdown) --- Contributor-Policies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributor-Policies.md b/Contributor-Policies.md index cb3d1eb..e552ed1 100644 --- a/Contributor-Policies.md +++ b/Contributor-Policies.md @@ -4,6 +4,6 @@ This page describes general procedures for the contributors with write access to 1. PRs to `dev` should have at least one review by a code owner before being merged. If a section does not have a codeowner, any contributor may review it. More reviews are always better, especially for large PRs or if there are no defined codeowners. -1. PRs to `dev` should be merged as "Rebase and merge" to avoid a cluttered history. +1. PRs to `dev` should be merged as "Create a merge commit" to ensure the relevant PR is always referenced. 1. PRs to `master` should only come from `dev` as a whole, and in the form of a release PR. This PR should be merged as "Create a merge commit" to preserve release history. The PR body should contain a full list of accepted `dev` PRs. The only exception to this procedure should be emergency PRs which address an extremely time-sensitive issue and where the usual process would be excessively long. \ No newline at end of file