From 367a0e89149c401411c3a13450c1cd3029179a22 Mon Sep 17 00:00:00 2001 From: Dylan Griffith Date: Tue, 27 Nov 2018 11:55:01 +0100 Subject: Clearer docs when it is OK for maintainer to squash --- doc/development/code_review.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 52710e54e86..3e838334c26 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -189,6 +189,9 @@ experience, refactors the existing code). Then: subsequent revisions for anything that would be spotted after that. - Consider using the [Squash and merge][squash-and-merge] feature when the merge request has a lot of commits. + When merging code a maintainer should only use the squash feature if the + author has already set this option or if the merge request clearly contains a + messy commit history that is intended to be squashed. [squash-and-merge]: https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html#squash-and-merge -- cgit v1.2.1