diff options
| author | Martin Fick <mfick@codeaurora.org> | 2013-05-14 13:15:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-14 13:15:22 +0000 |
| commit | a7f04b4f1b306219e30582ac8e44bba7fd47b34b (patch) | |
| tree | 7010dc020d96fb43b70a927783cf00c06a29f07c | |
| parent | d0e7b198abf0b5d09944f25b8f4c38a86c2a1764 (diff) | |
| parent | 17c051d9cd03dc22a83c6c74553e63109ba153c6 (diff) | |
Merge "Improve explanation of path conflicts in project config doc" into stable-2.6
| -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 |