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
Fields in org.eclipse.jgit.api declared as MergeStrategyModifier and TypeFieldDescriptionprivate MergeStrategyMergeCommand.mergeStrategyprivate MergeStrategyMergeResult.mergeStrategyprivate MergeStrategyCherryPickCommand.strategyprivate MergeStrategyPullCommand.strategyprivate MergeStrategyRebaseCommand.strategyprivate MergeStrategyRevertCommand.strategyprivate MergeStrategyStashApplyCommand.strategyprivate MergeStrategySubmoduleUpdateCommand.strategyMethods in org.eclipse.jgit.api with parameters of type MergeStrategyModifier and TypeMethodDescriptionCherryPickCommand.setStrategy(MergeStrategy strategy) Set theMergeStrategyMergeCommand.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 theMergeStrategyto 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 TypeClassDescriptionclassTrivial merge strategy to make the resulting tree exactly match an input.classA three-way merge strategy performing a content-merge if necessaryclassA three-way merge strategy performing a content-merge if necessaryclassMerges two commits together in-memory, ignoring any working directory.classA merge strategy to merge 2 trees, using a common base ancestor tree.Fields in org.eclipse.jgit.merge declared as MergeStrategyModifier and TypeFieldDescriptionstatic final MergeStrategyMergeStrategy.OURSSimple strategy that sets the output tree to the first input tree.static final MergeStrategyMergeStrategy.THEIRSSimple strategy that sets the output tree to the second input tree.Fields in org.eclipse.jgit.merge with type parameters of type MergeStrategyModifier and TypeFieldDescriptionprivate static final HashMap<String,MergeStrategy> MergeStrategy.STRATEGIESMethods in org.eclipse.jgit.merge that return MergeStrategyModifier and TypeMethodDescriptionstatic MergeStrategy[]MergeStrategy.get()Get all registered strategies.static MergeStrategyLocate a strategy by name.Methods in org.eclipse.jgit.merge with parameters of type MergeStrategyModifier and TypeMethodDescriptionstatic voidMergeStrategy.register(String name, MergeStrategy imp) Register a merge strategy so it can later be obtained by name.static voidMergeStrategy.register(MergeStrategy imp) Register a merge strategy so it can later be obtained by name. -
Uses of MergeStrategy in org.eclipse.jgit.notes
Fields in org.eclipse.jgit.notes declared as MergeStrategyConstructors in org.eclipse.jgit.notes with parameters of type MergeStrategyModifierConstructorDescriptionNoteMapMerger(Repository db, NoteMerger noteMerger, MergeStrategy nonNotesMergeStrategy) Constructs a NoteMapMerger with customNoteMergerand customMergeStrategy. -
Uses of MergeStrategy in org.eclipse.jgit.pgm
Fields in org.eclipse.jgit.pgm declared as MergeStrategy