Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Class and Description |
---|---|
class |
RecursiveMerger
A three-way merger performing a content-merge if necessary across multiple
bases using recursion
This merger extends the resolve merger and does several things differently:
- allow more than one merge base, up to a maximum
- uses "Lists" instead of Arrays for chained types
- recursively merges the merge bases together to compute a usable base
|
class |
ResolveMerger
A three-way merger performing a content-merge if necessary
|
Modifier and Type | Method and Description |
---|---|
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db) |
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db) |
ThreeWayMerger |
StrategyResolve.newMerger(Repository db) |
ThreeWayMerger |
StrategyRecursive.newMerger(Repository db) |
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db,
boolean inCore) |
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db,
boolean inCore) |
ThreeWayMerger |
StrategyResolve.newMerger(Repository db,
boolean inCore) |
ThreeWayMerger |
StrategyRecursive.newMerger(Repository db,
boolean inCore) |
Copyright © 2014. All rights reserved.