Uses of Class
org.eclipse.jgit.merge.MergeStrategy
Packages that use MergeStrategy
Package
Description
High-level API commands (the porcelain of JGit).
Content and commit history merge algorithms.
Git notes processing (for commits, etc).
-
Uses of MergeStrategy in org.eclipse.jgit.api
Methods in org.eclipse.jgit.api with parameters of type MergeStrategyModifier and TypeMethodDescriptionCherryPickCommand.setStrategy
(MergeStrategy strategy) Set theMergeStrategy
MergeCommand.setStrategy
(MergeStrategy mergeStrategy) Set merge strategyPullCommand.setStrategy
(MergeStrategy strategy) Set the @{code MergeStrategy}RebaseCommand.setStrategy
(MergeStrategy strategy) Set theMergeStrategy
.RevertCommand.setStrategy
(MergeStrategy strategy) Set the merge strategy to use for this revert commandStashApplyCommand.setStrategy
(MergeStrategy strategy) Set theMergeStrategy
to use.SubmoduleUpdateCommand.setStrategy
(MergeStrategy strategy) Setter for the fieldstrategy
.Constructors in org.eclipse.jgit.api with parameters of type MergeStrategyModifierConstructorDescriptionMergeResult
(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults) Constructor for MergeResult.MergeResult
(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, String description) Constructor for MergeResult.MergeResult
(ObjectId newHead, ObjectId base, ObjectId[] mergedCommits, MergeResult.MergeStatus mergeStatus, MergeStrategy mergeStrategy, Map<String, MergeResult<?>> lowLevelResults, Map<String, ResolveMerger.MergeFailureReason> failingPaths, String description) Constructor for MergeResult. -
Uses of MergeStrategy in org.eclipse.jgit.merge
Subclasses of MergeStrategy in org.eclipse.jgit.mergeModifier and TypeClassDescriptionclass
Trivial merge strategy to make the resulting tree exactly match an input.class
A three-way merge strategy performing a content-merge if necessaryclass
A three-way merge strategy performing a content-merge if necessaryclass
Merges two commits together in-memory, ignoring any working directory.class
A merge strategy to merge 2 trees, using a common base ancestor tree.Fields in org.eclipse.jgit.merge declared as MergeStrategyModifier and TypeFieldDescriptionstatic final MergeStrategy
MergeStrategy.OURS
Simple strategy that sets the output tree to the first input tree.static final MergeStrategy
MergeStrategy.THEIRS
Simple strategy that sets the output tree to the second input tree.Methods in org.eclipse.jgit.merge that return MergeStrategyModifier and TypeMethodDescriptionstatic MergeStrategy[]
MergeStrategy.get()
Get all registered strategies.static MergeStrategy
Locate a strategy by name.Methods in org.eclipse.jgit.merge with parameters of type MergeStrategyModifier and TypeMethodDescriptionstatic void
MergeStrategy.register
(String name, MergeStrategy imp) Register a merge strategy so it can later be obtained by name.static void
MergeStrategy.register
(MergeStrategy imp) Register a merge strategy so it can later be obtained by name. -
Uses of MergeStrategy in org.eclipse.jgit.notes
Constructors in org.eclipse.jgit.notes with parameters of type MergeStrategyModifierConstructorDescriptionNoteMapMerger
(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy) Constructs a NoteMapMerger with customNoteMerger
and customMergeStrategy
.