Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
meta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
meta
Commits
9cd0a751
Commit
9cd0a751
authored
1 year ago
by
Karl Fogel
Browse files
Options
Downloads
Patches
Plain Diff
Give more explanation in the "Obvious Fix" rule
parent
21d8f3dc
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CONTRIBUTING.md
+16
-7
16 additions, 7 deletions
CONTRIBUTING.md
with
16 additions
and
7 deletions
CONTRIBUTING.md
+
16
−
7
View file @
9cd0a751
...
@@ -129,15 +129,24 @@ include things like fixes for obvious typos (e.g., a misspelling in a
...
@@ -129,15 +129,24 @@ include things like fixes for obvious typos (e.g., a misspelling in a
comment or in a user-visible string), source code formatting changes
comment or in a user-visible string), source code formatting changes
(e.g., removing trailing whitespace from lines in preparation for a
(e.g., removing trailing whitespace from lines in preparation for a
substantive change to follow, as per the
[
"keep unrelated changes
substantive change to follow, as per the
[
"keep unrelated changes
separate"
](
#keep-unrelated-changes-separate
)
rule), etc. You may use
separate"
](
#keep-unrelated-changes-separate
)
rule), etc.
your judgement about what constitutes a trivial change. After all,
everything is under version control, so if someone makes a mistake, or
The purpose of this exception is to avoid paying the costs of the
there is disagreement about the effects of the change, then we can
review process in situations where it's unlikely to bring benefits.
roll back and discuss.
Going through review is good for quality, but it reduces velocity and
increases the state-maintenance burden for contributors -- an unlanded
change takes up space in people's minds as well as on MR lists. For
most changes, that cost is worth paying, but not for all.
You may use your judgement about what constitutes a trivial change.
Everything is under version control, so if someone makes a mistake, or
there is disagreement about the effects of the change, then the group
can roll back and discuss.
Note that individual projects may use stricter review guidelines, if
Note that individual projects may use stricter review guidelines, if
the development team wants to. Specifically, some projects don't make
the development team chooses to. Specifically, some projects don't
the "obvious fix" exception: everything goes through pre-merge review.
make the "obvious fix" exception, and prefer instead that everything
go through pre-merge review.
## No surprise rebasing
## No surprise rebasing
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment