opendev/gerrit
Code Issues Proposed changes

Use recursive merge by default

Browse Source 
If two commits that are merged have more than one common predecessor
the recursive merge is superior. In this situation the normal
non-recursive merge may even result in broken files without notice.
This is why the recursive merge should be enabled by default.

Change-Id: I4c5b8b2c6d406ec925da05838696c5c57f2348ef
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin 2014-07-15 08:57:17 +02:00 committed by Edwin Kempin
parent 71831d2707
commit 7853c5b94a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config-gerrit.txt
View File

@ -1103,7 +1103,7 @@ 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.
Default is true.
[[database]]
=== Section database

2
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@ -86,7 +86,7 @@ public class MergeUtil {
Constants.R_HEADS + Constants.MASTER;
public static boolean useRecursiveMerge(Config cfg) {
return cfg.getBoolean("core", null, "useRecursiveMerge", false);
return cfg.getBoolean("core", null, "useRecursiveMerge", true);
}
public static interface Factory {