Uses of Enum Class
org.eclipse.jgit.merge.ContentMergeStrategy
Packages that use ContentMergeStrategy
Package
Description
High-level API commands (the porcelain of JGit).
Content and commit history merge algorithms.
-
Uses of ContentMergeStrategy in org.eclipse.jgit.api
Fields in org.eclipse.jgit.api declared as ContentMergeStrategyModifier and TypeFieldDescriptionprivate ContentMergeStrategyCherryPickCommand.contentStrategyprivate ContentMergeStrategyMergeCommand.contentStrategyprivate ContentMergeStrategyPullCommand.contentStrategyprivate ContentMergeStrategyRebaseCommand.contentStrategyprivate ContentMergeStrategyStashApplyCommand.contentStrategyMethods in org.eclipse.jgit.api with parameters of type ContentMergeStrategyModifier and TypeMethodDescriptionCherryPickCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategyis "resolve" or "recursive".MergeCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategyis "resolve" or "recursive".PullCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategyis "resolve" or "recursive".RebaseCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategyis "resolve" or "recursive".StashApplyCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategyis "resolve" or "recursive". -
Uses of ContentMergeStrategy in org.eclipse.jgit.merge
Fields in org.eclipse.jgit.merge declared as ContentMergeStrategyModifier and TypeFieldDescriptionprivate ContentMergeStrategyResolveMerger.contentStrategyTheContentMergeStrategyto use for "resolve" and "recursive" merges.private ContentMergeStrategyMergeAlgorithm.strategyMethods in org.eclipse.jgit.merge that return ContentMergeStrategyModifier and TypeMethodDescriptionMergeAlgorithm.getContentMergeStrategy()Retrieves theContentMergeStrategy.ResolveMerger.getContentMergeStrategy()Retrieves the content merge strategy for content conflicts.static ContentMergeStrategyReturns the enum constant of this class with the specified name.static ContentMergeStrategy[]ContentMergeStrategy.values()Returns an array containing the constants of this enum class, in the order they are declared.Methods in org.eclipse.jgit.merge with parameters of type ContentMergeStrategyModifier and TypeMethodDescriptionprivate MergeResult<RawText>ResolveMerger.contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, Attributes[] attributes, ContentMergeStrategy strategy) Does the content merge.voidMergeAlgorithm.setContentMergeStrategy(ContentMergeStrategy strategy) Sets theContentMergeStrategy.voidResolveMerger.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy for content conflicts. -
Uses of ContentMergeStrategy in org.eclipse.jgit.pgm
Fields in org.eclipse.jgit.pgm declared as ContentMergeStrategy