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()
Get default name of this strategy implementation.
|
ThreeWayMerger |
newMerger(ObjectInserter inserter,
Config config)
Create a new merge instance.
|
ThreeWayMerger |
newMerger(Repository db)
Create a new merge instance.
|
ThreeWayMerger |
newMerger(Repository db,
boolean inCore)
Create a new merge instance.
|
get, get, register, register
public ThreeWayMerger newMerger(Repository db)
newMerger
in class StrategyResolve
db
- repository database the merger will read from, and eventually
write results back to.public ThreeWayMerger newMerger(Repository db, boolean inCore)
newMerger
in class StrategyResolve
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.public ThreeWayMerger newMerger(ObjectInserter inserter, Config config)
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.
newMerger
in class StrategyResolve
inserter
- inserter to write results back to.config
- repo config for reading diff algorithm settings.public String getName()
getName
in class StrategyResolve
Copyright © 2020 Eclipse JGit Project. All rights reserved.