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

Class AbstractPathGitMergeConflict

java.lang.Object

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

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

All Implemented Interfaces:

GitMergeConflict

Direct Known Subclasses:

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

public abstract class AbstractPathGitMergeConflict
extends AbstractGitMergeConflict

Constructor Summary

Constructors

Modifier	Constructor	Description
protected	AbstractPathGitMergeConflict(GitMergeConflictType type, String message, com.atlassian.bitbucket.content.ChangeType ourChange, com.atlassian.bitbucket.content.ChangeType theirChange, String path)
protected	AbstractPathGitMergeConflict(GitMergeConflictType type, String message, com.atlassian.bitbucket.content.ChangeType change, String path)

Method Summary

Modifier and Type	Method	Description
String	getPath()

Methods inherited from class com.atlassian.bitbucket.scm.git.command.merge.conflict.AbstractGitMergeConflict

getMessage, getOurChange, getTheirChange, getType

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Methods inherited from interface com.atlassian.bitbucket.scm.git.command.merge.conflict.GitMergeConflict

accept

Constructor Details

AbstractPathGitMergeConflict

protected AbstractPathGitMergeConflict(@Nonnull
 GitMergeConflictType type,
 @Nonnull
 String message,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType change,
 @Nonnull
 String path)

AbstractPathGitMergeConflict

protected AbstractPathGitMergeConflict(@Nonnull
 GitMergeConflictType type,
 @Nonnull
 String message,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType ourChange,
 @Nonnull
 com.atlassian.bitbucket.content.ChangeType theirChange,
 @Nonnull
 String path)

Method Details

getPath

@Nonnull
public String getPath()