Let Resolve be the default Merge strategy
the merge command should use by default the "resolve" merge strategy. Change-Id: I6c6973a3397cca12bd8a6bd950d04b1766a08b4c Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
This commit is contained in:
parent
45e79a526c
commit
47f4171315
|
@ -84,7 +84,7 @@
|
||||||
*/
|
*/
|
||||||
public class MergeCommand extends GitCommand<MergeResult> {
|
public class MergeCommand extends GitCommand<MergeResult> {
|
||||||
|
|
||||||
private MergeStrategy mergeStrategy = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE;
|
private MergeStrategy mergeStrategy = MergeStrategy.RESOLVE;
|
||||||
|
|
||||||
private List<Ref> commits = new LinkedList<Ref>();
|
private List<Ref> commits = new LinkedList<Ref>();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue