diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2011-10-12 10:04:47 +0200 |
|---|---|---|
| committer | Martin Fick <mfick@codeaurora.org> | 2011-12-28 12:30:29 -0700 |
| commit | 9ee01964a5a3e8a5b81fb33bbf1b73f8dab6b2fc (patch) | |
| tree | 2bc6e721f12840150dd329c9ddea17e8439cfabc | |
| parent | 1a5ed188893e1b0486ee62f07c2ec7fb92f8fe7e (diff) | |
Explain 'Automatically resolve conflicts'
In the Gerrit documentation explain the project option 'Automatically
resolve conflicts'.
Change-Id: Ib43316092001d5f02ba68507c95c7bfd3ad049ce
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
| -rw-r--r-- | Documentation/project-setup.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/project-setup.txt b/Documentation/project-setup.txt index edb43dc107..ad09bfd0fc 100644 --- a/Documentation/project-setup.txt +++ b/Documentation/project-setup.txt @@ -100,6 +100,11 @@ cherry-pick mode. Submitters must remember to submit changes in the right order since inter-change dependencies will not be enforced for them. +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. + Registering Additional Branches ------------------------------- |