public class StrategyRecursive extends StrategyResolve
OURS, RECURSIVE, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS| Constructor and Description |
|---|
StrategyRecursive() |
| Modifier and Type | Method and Description |
|---|---|
String |
getName() |
ThreeWayMerger |
newMerger(Repository db)
Create a new merge instance.
|
ThreeWayMerger |
newMerger(Repository db,
boolean inCore)
Create a new merge instance.
|
get, get, register, registerpublic ThreeWayMerger newMerger(Repository db)
MergeStrategynewMerger in class StrategyResolvedb - repository database the merger will read from, and eventually
write results back to.public ThreeWayMerger newMerger(Repository db, boolean inCore)
MergeStrategynewMerger in class StrategyResolvedb - 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.public String getName()
getName in class StrategyResolveCopyright © 2014. All rights reserved.