Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Class | 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
|
class |
ThreeWayMerger |
A merge of 2 trees, using a common base ancestor tree.
|
Modifier and Type | Method | Description |
---|---|---|
abstract Merger |
MergeStrategy.newMerger(Repository db) |
Create a new merge instance.
|
abstract Merger |
MergeStrategy.newMerger(Repository db,
boolean inCore) |
Create a new merge instance.
|
Merger |
StrategyOneSided.newMerger(Repository db) |
|
Merger |
StrategyOneSided.newMerger(Repository db,
boolean inCore) |
Copyright © 2018. All rights reserved.