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
Methods in org.eclipse.jgit.api with parameters of type ContentMergeStrategyModifier and TypeMethodDescriptionCherryPickCommand.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategy
is "resolve" or "recursive".MergeCommand.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategy
is "resolve" or "recursive".PullCommand.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategy
is "resolve" or "recursive".RebaseCommand.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategy
is "resolve" or "recursive".StashApplyCommand.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy to use if themerge strategy
is "resolve" or "recursive". -
Uses of ContentMergeStrategy in org.eclipse.jgit.merge
Methods in org.eclipse.jgit.merge that return ContentMergeStrategyModifier and TypeMethodDescriptionMergeAlgorithm.getContentMergeStrategy()
Retrieves theContentMergeStrategy
.ResolveMerger.getContentMergeStrategy()
Retrieves the content merge strategy for content conflicts.static ContentMergeStrategy
Returns 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 TypeMethodDescriptionvoid
MergeAlgorithm.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets theContentMergeStrategy
.void
ResolveMerger.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets the content merge strategy for content conflicts.