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

Interface GitMergeConflict

All Known Implementing Classes:

AbstractGitMergeConflict, AbstractPathGitMergeConflict, AddAddGitMergeConflict, AddRenameGitMergeConflict, ContentGitMergeConflict, ConvergentDirectoryRenameGitMergeConflict, ConvergentRenameGitMergeConflict, DeleteModifyGitMergeConflict, DeleteRenameGitMergeConflict, DirectoryFileGitMergeConflict, DivergentDirectoryRenameGitMergeConflict, DivergentRenameGitMergeConflict, FileDirectoryGitMergeConflict, ImplicitDirectoryRenameGitMergeConflict, MergedRenameGitMergeConflict, ModifyDeleteGitMergeConflict, RenameAddGitMergeConflict, RenameDeleteGitMergeConflict, SubmoduleGitMergeConflict, UnknownGitMergeConflict

public interface GitMergeConflict

Method Summary

Modifier and Type	Method and Description
void	accept(GitMergeConflictVisitor visitor)
String	getMessage()
com.atlassian.bitbucket.content.ChangeType	getOurChange()
com.atlassian.bitbucket.content.ChangeType	getTheirChange()
GitMergeConflictType	getType()

Method Detail

accept

void accept(@Nonnull
            GitMergeConflictVisitor visitor)

getMessage

@Nonnull
String getMessage()

getOurChange

@Nonnull
com.atlassian.bitbucket.content.ChangeType getOurChange()

getTheirChange

@Nonnull
com.atlassian.bitbucket.content.ChangeType getTheirChange()

getType

@Nonnull
GitMergeConflictType getType()