Uses of Class
org.eclipse.jgit.merge.Merger
Packages that use Merger
-
Uses of Merger in org.eclipse.jgit.merge
Subclasses of Merger in org.eclipse.jgit.mergeModifier and TypeClassDescriptionclass
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 baseclass
A three-way merger performing a content-merge if necessary(package private) static class
private static class
class
A merge of 2 trees, using a common base ancestor tree.Methods in org.eclipse.jgit.merge that return MergerModifier and TypeMethodDescriptionabstract Merger
MergeStrategy.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.abstract Merger
MergeStrategy.newMerger
(Repository db) Create a new merge instance.abstract Merger
MergeStrategy.newMerger
(Repository db, boolean inCore) Create a new merge instance.StrategyOneSided.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.StrategyOneSided.newMerger
(Repository db) Create a new merge instance.StrategyOneSided.newMerger
(Repository db, boolean inCore) Create a new merge instance.