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.
org.eclipse.jgit.pgm

Uses of ContentMergeStrategy in org.eclipse.jgit.api

Fields in org.eclipse.jgit.api declared as ContentMergeStrategy

Modifier and Type	Field	Description
private 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 ContentMergeStrategy

Modifier and Type	Method	Description
CherryPickCommand	CherryPickCommand.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".
PullCommand	PullCommand.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".
StashApplyCommand	StashApplyCommand.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

Fields in org.eclipse.jgit.merge declared as ContentMergeStrategy

Modifier and Type	Field	Description
private ContentMergeStrategy	ResolveMerger.contentStrategy	The ContentMergeStrategy to use for "resolve" and "recursive" merges.
private ContentMergeStrategy	MergeAlgorithm.strategy

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

Modifier and Type	Method	Description
ContentMergeStrategy	MergeAlgorithm.getContentMergeStrategy()	Retrieves the ContentMergeStrategy.
ContentMergeStrategy	ResolveMerger.getContentMergeStrategy()	Retrieves the content merge strategy for content conflicts.
static ContentMergeStrategy	ContentMergeStrategy.valueOf(java.lang.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	Description
private MergeResult<RawText>	ResolveMerger.contentMerge(CanonicalTreeParser base, CanonicalTreeParser ours, CanonicalTreeParser theirs, Attributes[] attributes, ContentMergeStrategy strategy)	Does the content merge.
void	MergeAlgorithm.setContentMergeStrategy(ContentMergeStrategy strategy)	Sets the ContentMergeStrategy.
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

Modifier and Type	Field	Description
private ContentMergeStrategy	Merge.contentStrategy