Skip to content
Snippets Groups Projects
Commit 9eee2c38 authored by Karl Fogel's avatar Karl Fogel
Browse files

Improve phrasing in "No surprise rebasing"

parent 9cd0a751
No related branches found
No related tags found
No related merge requests found
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment