opendev/gerrit
Code Issues Proposed changes

Improve explanation of path conflicts in project config doc

Browse Source 
Change-Id: I56b063790eb48e649b8380a008ff02902bffcf5e
This commit is contained in:
David Pursehouse
2013-05-14 17:45:00 +09:00
parent 57b44b0cd9
commit 17c051d9cd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/project-setup.txt
View File

@@ -108,9 +108,11 @@ then the change is automatically rebased and then the branch is
fast-forwarded to the change.
When Gerrit tries to do a merge, by default the merge will only
succeed if there is no path conflict. By selecting the checkbox
`Automatically resolve conflicts` Gerrit will try do a content merge
if a path conflict occurs.
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.
If `Automatically resolve conflicts` is enabled, Gerrit will try
to do a content merge when a path conflict occurs.
Registering Additional Branches