Uses of Enum Class
org.eclipse.jgit.api.MergeCommand.ConflictStyle

Packages that use MergeCommand.ConflictStyle

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 MergeCommand.ConflictStyle in org.eclipse.jgit.api

Methods in org.eclipse.jgit.api that return MergeCommand.ConflictStyle

Modifier and Type	Method	Description
static MergeCommand.ConflictStyle	MergeCommand.ConflictStyle.valueOf(String name)	Returns the enum constant of this class with the specified name.
static MergeCommand.ConflictStyle[]	MergeCommand.ConflictStyle.values()	Returns an array containing the constants of this enum class, in the order they are declared.

Methods in org.eclipse.jgit.api with parameters of type MergeCommand.ConflictStyle

Modifier and Type	Method	Description
CherryPickCommand	CherryPickCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.
MergeCommand	MergeCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.
PullCommand	PullCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.
RebaseCommand	RebaseCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.
RevertCommand	RevertCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.
StashApplyCommand	StashApplyCommand.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.

Uses of MergeCommand.ConflictStyle in org.eclipse.jgit.merge

Methods in org.eclipse.jgit.merge that return MergeCommand.ConflictStyle

Modifier and Type	Method	Description
MergeCommand.ConflictStyle	MergeConfig.getConflictStyle()	Get the configured conflict style

Methods in org.eclipse.jgit.merge with parameters of type MergeCommand.ConflictStyle

Modifier and Type	Method	Description
void	ResolveMerger.setConflictStyle(MergeCommand.ConflictStyle conflictStyle)	Sets the conflict style to be used when formatting merge conflicts.