From 3989f4198511c819077d896e363995bcf161531b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" <jryans@gmail.com> Date: Wed, 18 Mar 2020 10:23:27 +0000 Subject: [PATCH] Clarify merge options --- docs/review.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/review.md b/docs/review.md index 6c5472d2..23d8c1c5 100644 --- a/docs/review.md +++ b/docs/review.md @@ -44,7 +44,8 @@ When reviewing code, here are some things we look for and also things we avoid: review. Reviewers might be coming from different places and could miss other required PRs. * Avoid force pushing to a PR after first round of review -* Use merge commits when landing +* Use the GitHub default of merge commits when landing (avoid alternate options + like squash or rebase) * PR author merges after review (assuming they have write access) * Assign issues only when in progress to indicate to others what can be picked up