diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-11-27 11:55:01 +0100 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-11-27 11:55:01 +0100 |
| commit | 367a0e89149c401411c3a13450c1cd3029179a22 (patch) | |
| tree | c663931ea97836a27dd788c7b5c21cf97cdfbd89 | |
| parent | 3a3a767c4a4fa4ca7a2858d5c5940e557661187a (diff) | |
| download | gitlab-ce-367a0e89149c401411c3a13450c1cd3029179a22.tar.gz | |
Clearer docs when it is OK for maintainer to squash
| -rw-r--r-- | doc/development/code_review.md | 3 |
1 files changed, 3 insertions, 0 deletions
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 |