diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 12:09:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 12:09:19 +0300 |
commit | e7462f7b49a60b2ee7be14682c23190f7f7c5ba7 (patch) | |
tree | 3437f7c7c7931ff2e017de00e69dea10f3d00b57 /doc/development/code_review.md | |
parent | 43d38aaae05e2ac7e84c035c50844e084c3e54d3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/code_review.md')
-rw-r--r-- | doc/development/code_review.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md index e1a758f481f..0090372bb9f 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -385,9 +385,12 @@ When ready to merge: - Consider using the [Squash and merge](../user/project/merge_requests/squash_and_merge.md#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. + 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, it will be more efficient to squash commits instead of + circling back with the author about that. Otherwise, if the MR only has a few commits, we'll + be respecting the author's setting by not squashing them. + - **Start a new merge request pipeline with the `Run Pipeline` button in the merge request's "Pipelines" tab, and enable "Merge When Pipeline Succeeds" (MWPS).** Note that: - If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results)** finished less than 2 hours ago, you |