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

Class AddRenameGitMergeConflict

java.lang.Object

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

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

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

All Implemented Interfaces:

GitMergeConflict

public class AddRenameGitMergeConflict
extends AbstractPathGitMergeConflict

See Also:

RenameAddGitMergeConflict

Constructor Summary

Constructors

Constructor and Description
AddRenameGitMergeConflict(String message, String path, String theirSrcPath, String ourTmpPath)

Method Summary

Modifier and Type	Method and Description
void	accept(GitMergeConflictVisitor visitor)
String	getOurTmpPath()
String	getTheirSrcPath()

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

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

Constructor Detail

AddRenameGitMergeConflict

public AddRenameGitMergeConflict(@Nonnull
                                 String message,
                                 @Nonnull
                                 String path,
                                 @Nonnull
                                 String theirSrcPath,
                                 @Nullable
                                 String ourTmpPath)

Method Detail

accept

public void accept(@Nonnull
                   GitMergeConflictVisitor visitor)

getOurTmpPath

@Nullable
public String getOurTmpPath()

getTheirSrcPath

@Nonnull
public String getTheirSrcPath()