diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-28 10:30:56 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-11-28 10:30:56 +0000 |
| commit | 8cb6b66f3ccfb945da3961b783f265fdb13eb39e (patch) | |
| tree | 14567cfa577453b812de1e8b24f8e5ab4420738e /doc | |
| parent | 7a326bdabe9e32071ad6c05001fca7d5d8e8dbd8 (diff) | |
| parent | 367a0e89149c401411c3a13450c1cd3029179a22 (diff) | |
| download | gitlab-ce-8cb6b66f3ccfb945da3961b783f265fdb13eb39e.tar.gz | |
Merge branch 'more-guidelines-on-when-to-squash' into 'master'
Clearer docs when it is OK for maintainer to squash
See merge request gitlab-org/gitlab-ce!23376
Diffstat (limited to 'doc')
| -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 |