public abstract class AbstractGitMergeConflict extends Object implements GitMergeConflict
Modifier | Constructor and Description |
---|---|
protected |
AbstractGitMergeConflict(GitMergeConflictType type,
String message,
com.atlassian.bitbucket.content.ChangeType change) |
protected |
AbstractGitMergeConflict(GitMergeConflictType type,
String message,
com.atlassian.bitbucket.content.ChangeType ourChange,
com.atlassian.bitbucket.content.ChangeType theirChange) |
Modifier and Type | Method and Description |
---|---|
String |
getMessage() |
com.atlassian.bitbucket.content.ChangeType |
getOurChange() |
com.atlassian.bitbucket.content.ChangeType |
getTheirChange() |
GitMergeConflictType |
getType() |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
accept
protected AbstractGitMergeConflict(@Nonnull GitMergeConflictType type, @Nonnull String message, @Nonnull com.atlassian.bitbucket.content.ChangeType change)
@Nonnull public String getMessage()
getMessage
in interface GitMergeConflict
@Nonnull public com.atlassian.bitbucket.content.ChangeType getOurChange()
getOurChange
in interface GitMergeConflict
@Nonnull public com.atlassian.bitbucket.content.ChangeType getTheirChange()
getTheirChange
in interface GitMergeConflict
@Nonnull public GitMergeConflictType getType()
getType
in interface GitMergeConflict
Copyright © 2019 Atlassian. All rights reserved.