public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy
The strategy chooses a path from one of the two input trees if the path is unchanged in the other relative to their common merge base tree. This is a trivial 3-way merge (at the file path level only).
Modifications of the same file path (content and/or file mode) by both input trees will cause a merge conflict, as this strategy does not attempt to merge file contents.
OURS, RECURSIVE, RESOLVE, SIMPLE_TWO_WAY_IN_CORE, THEIRS
Modifier | Constructor and Description |
---|---|
protected |
StrategySimpleTwoWayInCore()
Create a new instance of the strategy.
|
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, register
protected StrategySimpleTwoWayInCore()
public String getName()
getName
in class MergeStrategy
public ThreeWayMerger newMerger(Repository db)
MergeStrategy
newMerger
in class ThreeWayMergeStrategy
db
- repository database the merger will read from, and eventually
write results back to.public ThreeWayMerger newMerger(Repository db, boolean inCore)
MergeStrategy
newMerger
in class ThreeWayMergeStrategy
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 © 2016 Eclipse JGit Project. All rights reserved.