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 ContentMergeStrategy
CherryPickCommand.contentStrategy
private ContentMergeStrategy
MergeCommand.contentStrategy
private ContentMergeStrategy
PullCommand.contentStrategy
private ContentMergeStrategy
RebaseCommand.contentStrategy
private ContentMergeStrategy
StashApplyCommand.contentStrategy
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
Fields in org.eclipse.jgit.merge declared as ContentMergeStrategyModifier and TypeFieldDescriptionprivate ContentMergeStrategy
ResolveMerger.contentStrategy
TheContentMergeStrategy
to use for "resolve" and "recursive" merges.private ContentMergeStrategy
MergeAlgorithm.strategy
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 TypeMethodDescriptionprivate MergeResult<RawText>
ResolveMerger.contentMerge
(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, Attributes[] attributes, ContentMergeStrategy strategy) Does the content merge.void
MergeAlgorithm.setContentMergeStrategy
(ContentMergeStrategy strategy) Sets theContentMergeStrategy
.void
ResolveMerger.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