opendev/gerrit
Code Issues Proposed changes

project-configuration: Fix formatting in submit type section

Browse Source 
Change-Id: Ie01696d6cf22e86245e3627c20c27c8b8edf1b68
This commit is contained in:
David Pursehouse
2019-07-16 08:38:15 +09:00
parent 00e3fe6584
commit 99aeeeaf0d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/project-configuration.txt
View File

@@ -114,7 +114,7 @@ If the change being submitted is a strict superset of the destination
branch, then the branch is fast-forwarded to the change. If not, branch, then the branch is fast-forwarded to the change. If not,
then the change is automatically rebased and then the branch is then the change is automatically rebased and then the branch is
fast-forwarded to the change. fast-forwarded to the change.
+
When Gerrit tries to do a merge, by default the merge will only When Gerrit tries to do a merge, by default the merge will only
succeed if there is no path conflict. A path conflict occurs when succeed if there is no path conflict. A path conflict occurs when
the same file has also been changed on the other side of the merge. the same file has also been changed on the other side of the merge.
@@ -126,7 +126,7 @@ Basically, the same as Rebase If Necessary, but it creates a new patchset even
if fast forward is possible AND like Cherry Pick it ensures footers such as if fast forward is possible AND like Cherry Pick it ensures footers such as
Change-Id, Reviewed-On, and others are present in resulting commit that is Change-Id, Reviewed-On, and others are present in resulting commit that is
merged. merged.
+
Thus, Rebase Always can be considered similar to Cherry Pick, but with Thus, Rebase Always can be considered similar to Cherry Pick, but with
the important distinction that Rebase Always does not ignore dependencies. the important distinction that Rebase Always does not ignore dependencies.