StrategyResolve
, StrategySimpleTwoWayInCore
public abstract class ThreeWayMergeStrategy extends MergeStrategy
OURS, RECURSIVE, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS
Constructor | Description |
---|---|
ThreeWayMergeStrategy() |
Modifier and Type | Method | Description |
---|---|---|
abstract ThreeWayMerger |
newMerger(Repository db) |
Create a new merge instance.
|
abstract ThreeWayMerger |
newMerger(Repository db,
boolean inCore) |
Create a new merge instance.
|
public abstract ThreeWayMerger newMerger(Repository db)
MergeStrategy
newMerger
in class MergeStrategy
db
- repository database the merger will read from, and eventually
write results back to.public abstract ThreeWayMerger newMerger(Repository db, boolean inCore)
MergeStrategy
newMerger
in class MergeStrategy
db
- repository database the merger will read from, and eventually
write results back to.inCore
- the merge will happen in memory, working folder will not be
modified, in case of a non-trivial merge that requires manual
resolution, the merger will fail.Copyright © 2018. All rights reserved.