Uses of Interface
com.atlassian.bitbucket.scm.git.command.merge.conflict.GitMergeConflict

Packages that use GitMergeConflict

Package	Description
com.atlassian.bitbucket.scm.git.command.merge
com.atlassian.bitbucket.scm.git.command.merge.conflict

Uses of GitMergeConflict in com.atlassian.bitbucket.scm.git.command.merge

Methods in com.atlassian.bitbucket.scm.git.command.merge that return types with arguments of type GitMergeConflict

Modifier and Type	Method and Description
List<GitMergeConflict>	GitMergeException.getConflicts()

Constructor parameters in com.atlassian.bitbucket.scm.git.command.merge with type arguments of type GitMergeConflict

Constructor and Description
GitMergeException(com.atlassian.bitbucket.i18n.KeyedMessage message, List<GitMergeConflict> conflicts)

Uses of GitMergeConflict in com.atlassian.bitbucket.scm.git.command.merge.conflict

Classes in com.atlassian.bitbucket.scm.git.command.merge.conflict that implement GitMergeConflict

Modifier and Type	Class and Description
class	AbstractGitMergeConflict
class	AbstractPathGitMergeConflict
class	AddAddGitMergeConflict
class	AddRenameGitMergeConflict
class	ContentGitMergeConflict
class	ConvergentDirectoryRenameGitMergeConflict Indicates an implicit directory rename failed because multiple directories which each contained a subset of the same files were renamed to the same target directory.
class	ConvergentRenameGitMergeConflict Describes a conflict where two different files are renamed to the same destination.
class	DeleteModifyGitMergeConflict
class	DeleteRenameGitMergeConflict
class	DirectoryFileGitMergeConflict
class	DivergentDirectoryRenameGitMergeConflict Indicates a directory rename failed because a single directory was renamed to multiple target directories and git merge could not decide where to move a file.
class	DivergentRenameGitMergeConflict A merge conflict where the same file has been renamed differently on each side of a merge.
class	FileDirectoryGitMergeConflict
class	ImplicitDirectoryRenameGitMergeConflict Indicates an implicit directory rename failed because an existing directory or file prevented git merge from moving one or more files to the renamed directory.
class	MergedRenameGitMergeConflict Describes a conflict where two different files are renamed to the same destination.
class	ModifyDeleteGitMergeConflict
class	RenameAddGitMergeConflict
class	RenameDeleteGitMergeConflict
class	SubmoduleGitMergeConflict A merge conflict where the same submodule has been updated to point to different commits.
class	UnknownGitMergeConflict