Uses of Class
org.eclipse.jgit.merge.ContentMergeStrategy

Packages that use ContentMergeStrategy

Package	Description
org.eclipse.jgit.api	High-level API commands (the porcelain of JGit).
org.eclipse.jgit.merge	Content and commit history merge algorithms.

Uses of ContentMergeStrategy in org.eclipse.jgit.api

Methods in org.eclipse.jgit.api with parameters of type ContentMergeStrategy

Modifier and Type	Method and Description
StashApplyCommand	StashApplyCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if the merge strategy is "resolve" or "recursive".
RebaseCommand	RebaseCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if the merge strategy is "resolve" or "recursive".
PullCommand	PullCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if the merge strategy is "resolve" or "recursive".
MergeCommand	MergeCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if the merge strategy is "resolve" or "recursive".
CherryPickCommand	CherryPickCommand.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy to use if the merge strategy is "resolve" or "recursive".

Uses of ContentMergeStrategy in org.eclipse.jgit.merge

Methods in org.eclipse.jgit.merge that return ContentMergeStrategy

Modifier and Type	Method and Description
ContentMergeStrategy	ResolveMerger.getContentMergeStrategy() Retrieves the content merge strategy for content conflicts.
ContentMergeStrategy	MergeAlgorithm.getContentMergeStrategy() Retrieves the ContentMergeStrategy.
static ContentMergeStrategy	ContentMergeStrategy.valueOf(String name) Returns the enum constant of this type with the specified name.
static ContentMergeStrategy[]	ContentMergeStrategy.values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods in org.eclipse.jgit.merge with parameters of type ContentMergeStrategy

Modifier and Type	Method and Description
void	ResolveMerger.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the content merge strategy for content conflicts.
void	MergeAlgorithm.setContentMergeStrategy(ContentMergeStrategy strategy) Sets the ContentMergeStrategy.