Improve the textual description of the content merge option
The original wording is misleading in multiple ways:
Firstly, it is unclear that "conflicts" refer to "path conflicts", not
"content conflicts". Usually Gerrit users have a strong Git background
and understand a (merge) conflict to always be a content conflict as
that is how "git merge" works.
Secondly, the conflict is not guaranteed to be resolved automatically.
If a path conflict turns out to be a content conflict where the same
lines of code are modified it still has to be resolved manually. We
should not create the impression that Gerrit tries to apply some magic
to automatically resolve line conflicts.
Change-Id: I46de5633055c06528e7aa94099952689743b6b6e
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index bd8980f..45a2664 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1205,7 +1205,7 @@
[[core.useRecursiveMerge]]core.useRecursiveMerge::
+
Use JGit's recursive merger for three-way merges. This only affects
-projects configured to automatically resolve conflicts.
+projects that allow content merges.
+
As explained in this
link:http://codicesoftware.blogspot.com/2011/09/merge-recursive-strategy.html[
diff --git a/Documentation/intro-project-owner.txt b/Documentation/intro-project-owner.txt
index 461aa91..b2fce88 100644
--- a/Documentation/intro-project-owner.txt
+++ b/Documentation/intro-project-owner.txt
@@ -238,7 +238,7 @@
=== Submit Type
An important decision for a project is the choice of the submit type
-and the content merge setting (aka `Automatically resolve conflicts`).
+and the content merge setting (see the `Allow content merges` option).
The link:project-configuration.html#submit_type[submit type] is the method
Gerrit uses to submit a change to the project. The submit type defines
what Gerrit should do on submit of a change if the destination branch
diff --git a/Documentation/project-configuration.txt b/Documentation/project-configuration.txt
index 94af04f..e8f870f 100644
--- a/Documentation/project-configuration.txt
+++ b/Documentation/project-configuration.txt
@@ -114,7 +114,7 @@
the same file has also been changed on the other side of the merge.
[[content_merge]]
-If `Automatically resolve conflicts` is enabled, Gerrit will try
+If `Allow content merges` is enabled, Gerrit will try
to do a content merge when a path conflict occurs.
[[project-state]]
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
index 4446354..affbe61 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties
@@ -20,7 +20,7 @@
buttonBrowseProjects = Browse
projects = All projects
projectRepoBrowser = Repository Browser
-useContentMerge = Automatically resolve conflicts
+useContentMerge = Allow content merges
useContributorAgreements = Require a valid contributor agreement to upload
useSignedOffBy = Require <code>Signed-off-by</code> in commit message
createNewChangeForAllNotInTarget = Create a new change for every commit not in the target branch
