opendev/gerrit
Code Issues Proposed changes

Update description of core.useRecursiveMerge

Browse Source 
The recursive merge in JGit is not new and experimental anymore.

Add a link to a blog that explains how the recursive merge works and
why it is better than the normal merge algorithm.

Change-Id: Ibeb9300d915f5702ebde9ff900db081ec1b2126e
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin 2014-07-15 08:54:29 +02:00
parent 91b7f7ce39
commit 71831d2707
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/config-gerrit.txt
View File

@ -1095,9 +1095,13 @@ Default is 64 entries.
[[core.useRecursiveMerge]]core.useRecursiveMerge::
+
Use JGit's new, experimental recursive merger for three-way merges.
This only affects projects configured to automatically resolve
conflicts.
Use JGit's recursive merger for three-way merges. This only affects
projects configured to automatically resolve conflicts.
+
As explained in this
link:http://codicesoftware.blogspot.com/2011/09/merge-recursive-strategy.html[
blog], the recursive merge produces better results if the two commits
that are merged have more than one common predecessor.
+
Default is false, but in a future release may default to true.