Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
367a0e89
Commit
367a0e89
authored
Nov 27, 2018
by
Dylan Griffith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clearer docs when it is OK for maintainer to squash
parent
3a3a767c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
doc/development/code_review.md
doc/development/code_review.md
+3
-0
No files found.
doc/development/code_review.md
View file @
367a0e89
...
@@ -189,6 +189,9 @@ experience, refactors the existing code). Then:
...
@@ -189,6 +189,9 @@ experience, refactors the existing code). Then:
subsequent revisions for anything that would be spotted after that.
subsequent revisions for anything that would be spotted after that.
-
Consider using the
[
Squash and
-
Consider using the
[
Squash and
merge
][
squash-and-merge
]
feature when the merge request has a lot of commits.
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
[
squash-and-merge
]:
https://docs.gitlab.com/ee/user/project/merge_requests/squash_and_merge.html#squash-and-merge
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment