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
9eee2c38
Commit
9eee2c38
authored
1 year ago
by
Karl Fogel
Browse files
Options
Downloads
Patches
Plain Diff
Improve phrasing in "No surprise rebasing"
parent
9cd0a751
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
+4
-4
4 additions, 4 deletions
CONTRIBUTING.md
with
4 additions
and
4 deletions
CONTRIBUTING.md
+
4
−
4
View file @
9eee2c38
...
@@ -154,10 +154,10 @@ It's okay to rebase a branch if everyone using that branch is aware
...
@@ -154,10 +154,10 @@ It's okay to rebase a branch if everyone using that branch is aware
that rebasing might happen on that branch. Otherwise, never rebase.
that rebasing might happen on that branch. Otherwise, never rebase.
In practice, this means that a developer doing iterative development
In practice, this means that a developer doing iterative development
on
a
branch (often as part of a review cycle) may rebase that
branch
on
their own
branch (often as part of a review cycle) may rebase that
with impunity, because their rebases won't affect anyone else:
no one
branch
with impunity, because their rebases won't affect anyone else:
else is making changes on that branch, although some people
might be
no one
else is making changes on that branch, although some people
watching and (re)reviewing a related merge request.
might be
watching and (re)reviewing a related merge request.
If multiple people are collaborating on a branch, then by default no
If multiple people are collaborating on a branch, then by default no
one should rebase that branch unless the entire group agrees that
one should rebase that branch unless the entire group agrees that
...
...
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