diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-05-14 17:45:00 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2013-05-14 17:45:32 +0900 |
| commit | 17c051d9cd03dc22a83c6c74553e63109ba153c6 (patch) | |
| tree | ff5d41527212c3e90f10464b5d792d250cf8b561 /Documentation | |
| parent | 57b44b0cd9491af415097bf195ef695d45bd9786 (diff) | |
Improve explanation of path conflicts in project config doc
Change-Id: I56b063790eb48e649b8380a008ff02902bffcf5e
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/project-setup.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/project-setup.txt b/Documentation/project-setup.txt index 244b4b8c10..36d3c60b0c 100644 --- a/Documentation/project-setup.txt +++ b/Documentation/project-setup.txt @@ -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 |