From 17c051d9cd03dc22a83c6c74553e63109ba153c6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 14 May 2013 17:45:00 +0900 Subject: [PATCH] Improve explanation of path conflicts in project config doc Change-Id: I56b063790eb48e649b8380a008ff02902bffcf5e --- Documentation/project-setup.txt | 8 +++++--- 1 file 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